CrOS settings/metrics: Correctly store Subscriptions

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_macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_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 {
 
 enum MetricsReportingChangeHistogramValue {
   METRICS_REPORTING_ERROR,
   METRICS_REPORTING_DISABLED,
   METRICS_REPORTING_ENABLED,
   METRICS_REPORTING_MAX
 };
 
 void RecordMetricsReportingHistogramValue(
@@ skipping 35 matching lines @@
   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);
 }
 
-#if defined(OS_CHROMEOS)
-// Callback function for Chrome OS device settings change, so that the update is
-// applied to metrics reporting state.
-void OnDeviceSettingChange() {
-  bool enable_metrics = false;
-  chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
-                                            &enable_metrics);
-  ChangeMetricsReportingState(enable_metrics);
-}
-#endif
-
 }  // namespace
 
 void ChangeMetricsReportingState(bool enabled) {
   ChangeMetricsReportingStateWithReply(enabled,
                                        OnMetricsReportingCallbackType());
 }
 
 // TODO(gayane): Instead of checking policy before setting the metrics pref set
 // the pref and register for notifications for the rest of the changes.
 void ChangeMetricsReportingStateWithReply(
@@ skipping 33 matching lines @@
     crash_keys::ClearMetricsClientId();
   }
 }
 
 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();
 }
-
-// TODO(gayane): Add unittest which will check that observer on device settings
-// will trigger this function and kMetricsReportinEnabled as well as metrics
-// service state will be updated accordingly.
-void SetupMetricsStateForChromeOS() {
-#if defined(OS_CHROMEOS)
-  chromeos::CrosSettings::Get()->AddSettingsObserver(
-      chromeos::kStatsReportingPref, base::Bind(&OnDeviceSettingChange));
-
-  OnDeviceSettingChange();
-#endif  // defined(OS_CHROMEOS)
-}