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..b5e770cf878665ba800c417bcf879275505643b4 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,6 +934,8 @@ void BrowserOptionsHandler::InitializePage() {
   SetupEasyUnlock();
   SetupExtensionControlledIndicators();
 
+  SetupMetricsReportingCheckbox();

[Alexei Svitkine (slow), 2014/09/09 20:30:05]

Move this to be right after the SetupMetricsReportingSettingVisibility() call
above, since they're related.

[gayane -on leave until 09-2017, 2014/09/10 16:58:27]

Done.

+
 #if defined(OS_CHROMEOS)
   SetupAccessibilityFeatures();
   policy::BrowserPolicyConnectorChromeOS* connector =
@@ -1867,4 +1873,39 @@ void BrowserOptionsHandler::SetupExtensionControlledIndicators() {
 #endif  // defined(OS_WIN)
 }
 
+void BrowserOptionsHandler::SetupMetricsReportingCheckbox() {
+#if !defined(OS_CHROMEOS)

[Alexei Svitkine (slow), 2014/09/09 20:30:05]

Add a comment about why this isn't enabled for CrOS.

[gayane -on leave until 09-2017, 2014/09/10 16:58:27]

Done.

+  bool checked = ChromeMetricsServiceAccessor::IsMetricsReportingEnabled();
+  bool disabled = !IsMetricsReportingUserChangable();
+
+  SetMetricsReportingCheckbox(checked, disabled);
+#endif
+}
+
+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) {
+  SetMetricsReportingCheckbox(enabled, !IsMetricsReportingUserChangable());
+}
+
+void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
+                                                        bool disabled) {
+  base::FundamentalValue checkedValue(checked);

[Alexei Svitkine (slow), 2014/09/09 20:30:05]

Nit: This should use camel_case since it's on the C++ side.

Or you can just inline them into the call as base::FundamentalValue(checked) and
so forth.

[gayane -on leave until 09-2017, 2014/09/10 16:58:27]

Done.

+  base::FundamentalValue disabledValue(disabled);
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.setMetricsReportingCheckboxState",
+      checkedValue,
+      disabledValue);
+}
+
 }  // namespace options