Consolidates accessing and setting the UMA pref to be within metrics code

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index d3b772e0fcfeaee3a936c0ea55239921568252af..afda8b6119ce444fda13042a81d6953046a666b8 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -30,6 +30,8 @@
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
+#include "chrome/browser/metrics/metrics_reporting_state.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
@@ -538,9 +540,8 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
   values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL);
 
 #if !defined(OS_CHROMEOS)
-  PrefService* pref_service = g_browser_process->local_state();
-  values->SetBoolean("metricsReportingEnabledAtStart", pref_service->GetBoolean(
-      prefs::kMetricsReportingEnabled));
+  values->SetBoolean("metricsReportingEnabledAtStart",
+       ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -759,6 +760,9 @@ void BrowserOptionsHandler::RegisterMessages() {
           &BrowserOptionsHandler::HandleRefreshExtensionControlIndicators,
           base::Unretained(this)));
 #endif  // defined(OS_WIN)
+  web_ui()->RegisterMessageCallback("metricsReportingCheckboxChanged",
+      base::Bind(&BrowserOptionsHandler::HandleMetricsReportingChange,
+                 base::Unretained(this)));
 }
 
 void BrowserOptionsHandler::Uninitialize() {
@@ -930,7 +934,9 @@ void BrowserOptionsHandler::InitializePage() {
   SetupEasyUnlock();
   SetupExtensionControlledIndicators();
 
-#if defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
+  SetupMetricsReportingCheckbox();

[Alexei Svitkine (slow), 2014/09/09 15:27:15]

Put the ifdef inside the function itself with a comment and call it
unconditionally from here.

[gayane -on leave until 09-2017, 2014/09/09 19:40:51]

Done.

+#else
   SetupAccessibilityFeatures();
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
@@ -1867,4 +1873,32 @@ void BrowserOptionsHandler::SetupExtensionControlledIndicators() {
 #endif  // defined(OS_WIN)
 }
 
+void BrowserOptionsHandler::SetupMetricsReportingCheckbox() {
+  LOG(ERROR) << ChromeMetricsServiceAccessor::IsMetricsReportingEnabled();

[Alexei Svitkine (slow), 2014/09/09 15:27:15]

Remove extra log message.

[gayane -on leave until 09-2017, 2014/09/09 19:40:51]

Done.

+  base::FundamentalValue checked(
+      ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
+  base::FundamentalValue disabled(!IsMetricsReportingUserChangable());
+
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.setMetricsReportingCheckboxState", checked, disabled);
+}
+
+void BrowserOptionsHandler::HandleMetricsReportingChange(
+    const base::ListValue* args) {
+  bool enable;
+  if (!args->GetBoolean(0, &enable))
+    return;
+
+  base::Callback<void(bool)> callback_fn = base::Bind(
+      &BrowserOptionsHandler::MetricsReportingChangeCallback,
+      base::Unretained(this));
+  InitiateMetricsReportingChange(enable, callback_fn);
+}
+
+void BrowserOptionsHandler::MetricsReportingChangeCallback(bool enabled) {
+  base::FundamentalValue checked(enabled);
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.setMetricsReportingCheckboxState", checked);
+}
+
 }  // namespace options