Use kMetricsReportingEnabled instead of kStatsReporingPref on metrics side

chrome/browser/metrics/metrics_reporting_state.cc

 // Copyright (c) 2012 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_reporting_state.h"
 
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 40 matching lines @@
 void SetMetricsReporting(bool to_update_pref,
                          const OnMetricsReportingCallbackType& callback_fn,
                          bool updated_pref) {
   metrics::MetricsService* metrics = g_browser_process->metrics_service();
   if (metrics) {
     if (updated_pref)
       metrics->Start();
     else
       metrics->Stop();
   }
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+#if !defined(OS_ANDROID)
   g_browser_process->local_state()->SetBoolean(
       metrics::prefs::kMetricsReportingEnabled, updated_pref);
 #endif
   // When a user opts in to the metrics reporting service, the previously
   // collected data should be cleared to ensure that nothing is reported before
   // a user opts in and all reported data is accurate.
   if (updated_pref && metrics)
     metrics->ClearSavedStabilityMetrics();
 
   if (to_update_pref == updated_pref) {
     RecordMetricsReportingHistogramValue(updated_pref ?
         METRICS_REPORTING_ENABLED : METRICS_REPORTING_DISABLED);
   } else {
     RecordMetricsReportingHistogramValue(METRICS_REPORTING_ERROR);
   }
   if (!callback_fn.is_null())
     callback_fn.Run(updated_pref);
 }
 
 } // namespace
 
 void InitiateMetricsReportingChange(
     bool enabled,
     const OnMetricsReportingCallbackType& callback_fn) {
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-  if (!IsMetricsReportingUserChangable()) {
+#if !defined(OS_ANDROID)
+  if (IsMetricsReportingPolicyManaged()) {

[Mattias Nissler (ping if slow), 2015/10/20 08:33:32]

It's weird to have an |enabled| parameter but then restrict it - the canonical
solution would be to just take the value obtained from PrefService, and have
PrefService worry about sorting out policy lockdown. Then, you could register
for change notifications to the pref key with PrefService and just update your
state when PrefService signals a pref change.

This is mostly background information in case it is useful, you may not be able
to follow this advice just yet, as long as there are special cases for some
platforms that need to pass the desired value.

[gayane -on leave until 09-2017, 2015/10/20 14:55:39]

I agree. If you don't mind I will do it in separate CL.

[Mattias Nissler (ping if slow), 2015/10/21 09:53:24]

Yes, no action required here.

     if (!callback_fn.is_null()) {
       callback_fn.Run(
           ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled());
     }
     return;
   }
 #endif
   // Posts to FILE thread as SetGoogleUpdateSettings does IO operations.
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&SetGoogleUpdateSettings, enabled),
       base::Bind(&SetMetricsReporting, enabled, callback_fn));
 }
 
-bool IsMetricsReportingUserChangable() {
+bool IsMetricsReportingPolicyManaged() {
   const PrefService* pref_service = g_browser_process->local_state();
   const PrefService::Preference* pref =
       pref_service->FindPreference(metrics::prefs::kMetricsReportingEnabled);
-  return pref && !pref->IsManaged();
+  return pref && pref->IsManaged();
 }