metrics: don't record metrics unless user has opted-in.

This worked before, but regressed for Chromium builds.

BUG=2278

Review URL: http://codereview.chromium.org/113350

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15985 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 1bde447..8c9736c 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -591,11 +591,13 @@ int BrowserMain(const MainFunctionParams& parameters) {
 
   MetricsService* metrics = NULL;
   if (!parsed_command_line.HasSwitch(switches::kDisableMetrics)) {
+    bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);
     bool record_only =
         parsed_command_line.HasSwitch(switches::kMetricsRecordingOnly);
 
 #if !defined(GOOGLE_CHROME_BUILD)
-    record_only = true;
+    // Disable user metrics completely for non-Google Chrome builds.
+    enabled = false;
 #endif
 
     if (record_only) {
@@ -612,8 +614,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
     } else {
       // If the user permits metrics reporting with the checkbox in the
       // prefs, we turn on recording.
-      bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);
-
       metrics->SetUserPermitsUpload(enabled);
       if (enabled)
         metrics->Start();