2 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 8a4e726..53eeadb 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -951,10 +951,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
   CHECK(metrics_reporting_enabled);
   bool breakpad_enabled =
       local_state->GetBoolean(prefs::kMetricsReportingEnabled);
-  if (!breakpad_enabled && metrics_reporting_enabled->IsUserModifiable()) {
-    breakpad_enabled = (getenv(env_vars::kHeadless) != NULL) ||
-        parsed_command_line.HasSwitch(switches::kEnableCrashReporter);
-  }
+  if (!breakpad_enabled && metrics_reporting_enabled->IsUserModifiable())
+    breakpad_enabled = getenv(env_vars::kHeadless) != NULL;
   if (breakpad_enabled)
     InitCrashReporter();
 #endif
diff --git a/chrome/browser/google/google_update_settings_posix.cc b/chrome/browser/google/google_update_settings_posix.cc
index dbc6f1f..242407c 100644
--- a/chrome/browser/google/google_update_settings_posix.cc
+++ b/chrome/browser/google/google_update_settings_posix.cc
@@ -4,12 +4,10 @@
 
 #include "chrome/installer/util/google_update_settings.h"
 
-#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
 
 namespace google_update {
 std::string posix_guid;
@@ -20,16 +18,14 @@ static const char kConsentToSendStats[] = "Consent To Send Stats";
 
 // static
 bool GoogleUpdateSettings::GetCollectStatsConsent() {
-  bool forced_enable = CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kEnableCrashReporter);
   FilePath consent_file;
   PathService::Get(chrome::DIR_USER_DATA, &consent_file);
   consent_file = consent_file.Append(kConsentToSendStats);
   std::string tmp_guid;
   bool consented = file_util::ReadFileToString(consent_file, &tmp_guid);
-  if (forced_enable || consented)
+  if (consented)
     google_update::posix_guid.assign(tmp_guid);
-  return forced_enable || consented;
+  return consented;
 }
 
 // static