CrOS settings/metrics: Correctly store Subscriptions

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/feature_list.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 15 matching lines @@
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/install_static/install_util.h"
 #include "components/crash/content/app/crashpad.h"
 #endif  // OS_WIN
 
+#if defined(OS_CHROMEOS)
+#include "chromeos/settings/cros_settings_names.h"
+#endif  // defined(OS_CHROMEOS)
+
 namespace {
 
 #if defined(OS_WIN)
 // Type for the function pointer to enable and disable crash reporting on
 // windows. Needed because the function is loaded from chrome_elf.
 typedef void (*SetUploadConsentPointer)(bool);
 
 // The name of the function used to set the uploads enabled state in
 // components/crash/content/app/crashpad.cc. This is used to call the function
 // exported by the chrome_elf dll.
@@ skipping 39 matching lines @@
 }
 
 // Only clients that were given an opt-out metrics-reporting consent flow are
 // eligible for sampling.
 bool IsClientEligibleForSampling() {
   return metrics::GetMetricsReportingDefaultState(
              g_browser_process->local_state()) ==
          metrics::EnableMetricsDefault::OPT_OUT;
 }
 
+#if defined(OS_CHROMEOS)
+// Callback to update the metrics reporting state when the Chrome OS metrics
+// reporting setting changes.
+void OnCrosMetricsReportingSettingChange() {
+  bool enable_metrics = false;
+  chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
+                                            &enable_metrics);
+  ChangeMetricsReportingState(enable_metrics);
+}
+#endif
+
 }  // namespace
 
 
 class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider
     : public metrics::EnabledStateProvider {
  public:
   ChromeEnabledStateProvider() {}
   ~ChromeEnabledStateProvider() override {}
 
   bool IsConsentGiven() override {
     return ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
   }
 
   bool IsReportingEnabled() override {
     return IsConsentGiven() &&
            ChromeMetricsServicesManagerClient::IsClientInSample();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ChromeEnabledStateProvider);
 };
 
 ChromeMetricsServicesManagerClient::ChromeMetricsServicesManagerClient(
     PrefService* local_state)
     : enabled_state_provider_(new ChromeEnabledStateProvider()),
       local_state_(local_state) {
   DCHECK(local_state);
 
-  SetupMetricsStateForChromeOS();
+#if defined(OS_CHROMEOS)
+  cros_settings_observer_ = chromeos::CrosSettings::Get()->AddSettingsObserver(
+      chromeos::kStatsReportingPref,
+      base::Bind(&OnCrosMetricsReportingSettingChange));
+  // Invoke the callback once initially to set the metrics reporting state.
+  OnCrosMetricsReportingSettingChange();
+#endif
 }
 
 ChromeMetricsServicesManagerClient::~ChromeMetricsServicesManagerClient() {}
 
 // static
 void ChromeMetricsServicesManagerClient::CreateFallbackSamplingTrial(
     version_info::Channel channel,
     base::FeatureList* feature_list) {
   // The trial name must be kept in sync with the server config controlling
   // sampling. If they don't match, then clients will be shuffled into different
@@ skipping 135 matching lines @@
 ChromeMetricsServicesManagerClient::GetMetricsStateManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!metrics_state_manager_) {
     metrics_state_manager_ = metrics::MetricsStateManager::Create(
         local_state_, enabled_state_provider_.get(),
         base::Bind(&PostStoreMetricsClientInfo),
         base::Bind(&GoogleUpdateSettings::LoadMetricsClientInfo));
   }
   return metrics_state_manager_.get();
 }