Fix ChromeMetricsServiceAccessor::IsMetricsReportingEnabled on CrOs

chrome/browser/metrics/metrics_services_manager.cc

Index: chrome/browser/metrics/metrics_services_manager.cc
diff --git a/chrome/browser/metrics/metrics_services_manager.cc b/chrome/browser/metrics/metrics_services_manager.cc
index ab7426116d7bc9018e66648cda4d2bd1907c6e4f..aedf35fa91bf085fd8ffe8393a600714c5a410f6 100644
--- a/chrome/browser/metrics/metrics_services_manager.cc
+++ b/chrome/browser/metrics/metrics_services_manager.cc
@@ -10,6 +10,7 @@
 #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"
@@ -127,24 +128,12 @@ void MetricsServicesManager::UpdatePermissions(bool may_record,
   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();
 }