Use kMetricsReportingEnabled instead of kStatsReporingPref on metrics side

chrome/browser/metrics/chrome_metrics_services_manager_client.cc

 // Copyright 2015 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/chrome_metrics_services_manager_client.h"
 
 #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/chrome_variations_service_client.h"
 #include "chrome/browser/metrics/variations/ui_string_overrider_factory.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/rappor/rappor_service.h"
 #include "components/variations/service/variations_service.h"
 #include "content/public/browser/browser_thread.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chromeos/settings/cros_settings_names.h"
+#endif  // defined(OS_CHROMEOS)
+
 namespace {
 
 // Posts |GoogleUpdateSettings::StoreMetricsClientInfo| on blocking pool thread
 // because it needs access to IO and cannot work from UI thread.
 void PostStoreMetricsClientInfo(const metrics::ClientInfo& client_info) {
   content::BrowserThread::GetBlockingPool()->PostTask(
       FROM_HERE,
       base::Bind(&GoogleUpdateSettings::StoreMetricsClientInfo, client_info));
 }
 
+// Initialize kMetricsReportingEnabled based on kStatsReportingPref device
+// setting and add an observer as it is the source of truth on Chrome OS.
+void SetupMetricsStateForChromeOS() {

[Alexei Svitkine (slow), 2015/11/02 21:50:32]

Suggest moving this to metrics_reporting_state.cc and then
OnDeviceSettingChange() can be a local method to that file in the anon
namespace.

[gayane -on leave until 09-2017, 2015/11/03 19:46:17]

Done.

+#if defined(OS_CHROMEOS)
+  chromeos::CrosSettings::Get()->AddSettingsObserver(
+      chromeos::kStatsReportingPref, base::Bind(&onDeviceSettingsChange));
+
+  onDeviceSettingsChange();
+#endif // defined(OS_CHROMEOS)
+}
+
 }  // namespace
 
 ChromeMetricsServicesManagerClient::ChromeMetricsServicesManagerClient(
     PrefService* local_state)
     : local_state_(local_state) {
   DCHECK(local_state);
+
+  SetupMetricsStateForChromeOS();
 }
 
 ChromeMetricsServicesManagerClient::~ChromeMetricsServicesManagerClient() {}
 
 scoped_ptr<rappor::RapporService>
 ChromeMetricsServicesManagerClient::CreateRapporService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return make_scoped_ptr(new rappor::RapporService(
       local_state_, base::Bind(&chrome::IsOffTheRecordSessionActive)));
 }
@@ skipping 53 matching lines @@
   if (!metrics_state_manager_) {
     metrics_state_manager_ = metrics::MetricsStateManager::Create(
         local_state_,
         base::Bind(
             &ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled),
         base::Bind(&PostStoreMetricsClientInfo),
         base::Bind(&GoogleUpdateSettings::LoadMetricsClientInfo));
   }
   return metrics_state_manager_.get();
 }