Restoring check for CHROME_HEADLESS environment variable when initializing BreakPad.

chrome/browser/browser_main.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 963 matching lines @@
   // deletions.  We need this new instance because, the old instance created
   // in ChromeMain() got destructed when the function returned.
   base::AtExitManager exit_manager;
   Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded();
 }
 #endif
 
 #if defined(USE_LINUX_BREAKPAD)
 bool IsMetricsReportingEnabled(const PrefService* local_state) {
   // Check whether we should initialize the crash reporter. It may be disabled
-  // through configuration policy or user preference. The kHeadless environment
-  // variable overrides the decision, but only if the crash service is under
-  // control of the user. The CHROME_HEADLESS environment variable is used by QA
-  // testing infrastructure to switch on generation of crash reports.
+  // through configuration policy or user preference.
+  // The kHeadless environment variable overrides the decision, but only if the
+  // crash service is under control of the user. It is used by QA testing
+  // infrastructure to switch on generation of crash reports.
 #if defined(OS_CHROMEOS)
   bool breakpad_enabled =
       chromeos::MetricsCrosSettingsProvider::GetMetricsStatus();
+  if (!breakpad_enabled)
+    breakpad_enabled = getenv(env_vars::kHeadless) != NULL;
 #else
   const PrefService::Preference* metrics_reporting_enabled =
       local_state->FindPreference(prefs::kMetricsReportingEnabled);
   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;
 #endif  // #if defined(OS_CHROMEOS)
   return breakpad_enabled;
@@ skipping 662 matching lines @@
   metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   ignore_result(browser_process.release());
   browser_shutdown::Shutdown();
 
   TRACE_EVENT_END("BrowserMain", 0, 0);
   return result_code;
 }