Commit a185fbad authored by iclelland's avatar iclelland Committed by Commit bot

Revert of Add a crash key to record whether a windows machine is domain...

Revert of Add a crash key to record whether a windows machine is domain joined. (patchset #3 id:60001 of https://codereview.chromium.org/2514483002/ )

Reason for revert:
Reverting this; it appears to be causing 140+ failures in telmetry tests on Win7 (See the failures in https://uberchromegw.corp.google.com/i/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/55150/steps/telemetry_unittests%20on%20Windows-7-SP1/logs/stdio )

As far as I can tell (the log output is being suppressed,) it looks it's hitting the DCHECK in SetCrashKeyValue that would indicate that the key isn't registered as expected.

Also filed https://bugs.chromium.org/p/chromium/issues/detail?id=669633

Original issue's description:
> Add a crash key to record whether a windows machine is domain joined.
>
> BUG=660868
>
> Committed: https://crrev.com/bf33256aee8db58c30b9d36e991055f2a4ed62a4
> Cr-Commit-Position: refs/heads/master@{#435018}

TBR=siggi@chromium.org,sky@chromium.org,georgesak@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=660868

Review-Url: https://codereview.chromium.org/2536293002
Cr-Commit-Position: refs/heads/master@{#435069}
parent 50c9dd90
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
#include "chrome/browser/defaults.h" #include "chrome/browser/defaults.h"
#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/geolocation/chrome_access_token_store.h" #include "chrome/browser/geolocation/chrome_access_token_store.h"
#include "chrome/browser/google/google_brand.h"
#include "chrome/browser/gpu/gpu_profile_cache.h" #include "chrome/browser/gpu/gpu_profile_cache.h"
#include "chrome/browser/gpu/three_d_api_observer.h" #include "chrome/browser/gpu/three_d_api_observer.h"
#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
...@@ -962,14 +961,6 @@ int ChromeBrowserMainParts::PreCreateThreads() { ...@@ -962,14 +961,6 @@ int ChromeBrowserMainParts::PreCreateThreads() {
int ChromeBrowserMainParts::PreCreateThreadsImpl() { int ChromeBrowserMainParts::PreCreateThreadsImpl() {
TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreCreateThreadsImpl") TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreCreateThreadsImpl")
run_message_loop_ = false; run_message_loop_ = false;
// Record whether the machine is domain joined (Win only) in a crash key. This
// will be used to better identify whether crashes are from enterprise users.
#if defined(OS_WIN)
base::debug::SetCrashKeyValue(crash_keys::kEnrolledToDomain,
base::win::IsEnrolledToDomain() ? "yes" : "no");
#endif
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
chrome::MaybeShowInvalidUserDataDirWarningDialog(); chrome::MaybeShowInvalidUserDataDirWarningDialog();
#endif // !defined(OS_ANDROID) #endif // !defined(OS_ANDROID)
......
...@@ -58,8 +58,6 @@ const char kHungRendererReason[] = "hung-reason"; ...@@ -58,8 +58,6 @@ const char kHungRendererReason[] = "hung-reason";
const char kThirdPartyModulesLoaded[] = "third-party-modules-loaded"; const char kThirdPartyModulesLoaded[] = "third-party-modules-loaded";
const char kThirdPartyModulesNotLoaded[] = "third-party-modules-not-loaded"; const char kThirdPartyModulesNotLoaded[] = "third-party-modules-not-loaded";
const char kEnrolledToDomain[] = "enrolled-to-domain";
#endif #endif
const char kInputEventFilterSendFailure[] = "input-event-filter-send-failure"; const char kInputEventFilterSendFailure[] = "input-event-filter-send-failure";
...@@ -145,7 +143,6 @@ size_t RegisterChromeCrashKeys() { ...@@ -145,7 +143,6 @@ size_t RegisterChromeCrashKeys() {
{ kHungRendererReason, kSmallSize }, { kHungRendererReason, kSmallSize },
{ kThirdPartyModulesLoaded, kSmallSize }, { kThirdPartyModulesLoaded, kSmallSize },
{ kThirdPartyModulesNotLoaded, kSmallSize }, { kThirdPartyModulesNotLoaded, kSmallSize },
{ kEnrolledToDomain, kSmallSize },
#endif #endif
{ kInputEventFilterSendFailure, kSmallSize }, { kInputEventFilterSendFailure, kSmallSize },
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
......
...@@ -95,8 +95,6 @@ extern const char kHungRendererReason[]; ...@@ -95,8 +95,6 @@ extern const char kHungRendererReason[];
// Third-party module crash keys are sent only on Windows. // Third-party module crash keys are sent only on Windows.
extern const char kThirdPartyModulesLoaded[]; extern const char kThirdPartyModulesLoaded[];
extern const char kThirdPartyModulesNotLoaded[]; extern const char kThirdPartyModulesNotLoaded[];
extern const char kEnrolledToDomain[];
#endif #endif
// Number of input event send IPC failures. Added to debug // Number of input event send IPC failures. Added to debug
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment