Allow changing metrics reporting state without callback.

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 "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 75 matching lines @@
     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);
-  InitiateMetricsReportingChange(enable_metrics,
-                                 OnMetricsReportingCallbackType());
+  ChangeMetricsReportingState(enable_metrics);
 }
 #endif
 
 } // namespace
 
+void ChangeMetricsReportingState(bool enabled) {
+  ChangeMetricsReportingStateWithReply(enabled,
+                                       OnMetricsReportingCallbackType());
+}

[Ilya Sherman, 2016/08/05 03:39:06]

nit: Please define this in the same order in the .cc file as in the .h file.

[gayane -on leave until 09-2017, 2016/08/05 17:31:43]

Done.

+
 // 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 InitiateMetricsReportingChange(
+void ChangeMetricsReportingStateWithReply(
     bool enabled,
     const OnMetricsReportingCallbackType& callback_fn) {
 #if !defined(OS_ANDROID)
   if (IsMetricsReportingPolicyManaged()) {
     if (!callback_fn.is_null()) {
       callback_fn.Run(
           ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled());
     }
     return;
   }
@@ skipping 17 matching lines @@
 // 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)
 }