Fix ChromeMetricsServiceAccessor::IsMetricsReportingEnabled on CrOs

chrome/browser/metrics/metrics_services_manager.cc

 // Copyright 2014 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/metrics/metrics_services_manager.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/rappor/rappor_service.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 97 matching lines @@
       metrics->DisableReporting();
   } else if (metrics->recording_active() || metrics->reporting_active()) {
     metrics->Stop();
   }
 
   rappor::RecordingLevel recording_level = may_record ?
       rappor::FINE_LEVEL : rappor::RECORDING_DISABLED;
   GetRapporService()->Update(recording_level, may_upload);
 }
 
+void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) {
+  return UpdatePermissions(IsMetricsReportingEnabled(), may_upload);
+}
+
 // TODO(asvitkine): This function does not report the correct value on Android,
 // see http://crbug.com/362192.

[Alexei Svitkine (slow), 2015/02/12 15:58:46]

Nit: Move this comment to the moved implementation.

[anthonyvd, 2015/02/12 16:29:20]

Done.

 bool MetricsServicesManager::IsMetricsReportingEnabled() const {

[Alexei Svitkine (slow), 2015/02/12 15:58:46]

Maybe we don't need this function on this wrapper anymore and the other one can
just be called directly?

[anthonyvd, 2015/02/12 16:29:19]

Done.

-  // If the user permits metrics reporting with the checkbox in the
-  // prefs, we turn on recording.  We disable metrics completely for
-  // non-official builds, or when field trials are forced.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kForceFieldTrials))
-    return false;
-
-  bool enabled = false;
-#if defined(GOOGLE_CHROME_BUILD)
-#if defined(OS_CHROMEOS)
-  chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
-                                            &enabled);
-#else
-  enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled);
-#endif  // #if defined(OS_CHROMEOS)
-#endif  // defined(GOOGLE_CHROME_BUILD)
-  return enabled;
+  return ChromeMetricsServiceAccessor::IsMetricsReportingEnabled();
 }