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

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/app_window.h"
@@ skipping 14 matching lines @@
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/auto_launch_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #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/net/prediction_options.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
@@ skipping 490 matching lines @@
   values->SetString("username", username);
 #endif
 
   // Pass along sync status early so it will be available during page init.
   values->Set("syncData", GetSyncStateDictionary().release());
 
   values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
   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)
   // TODO(pastarmovj): replace this with a call to the CrosSettings list
   // handling functionality to come.
   values->Set("timezoneList", chromeos::system::GetTimezoneList().release());
 
   values->SetString("accessibilityLearnMoreURL",
                     chrome::kChromeAccessibilityHelpURL);
 
@@ skipping 312 matching lines @@
       base::Bind(&BrowserOptionsHandler::SetupManagingSupervisedUsers,
                  base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kSigninAllowed,
       base::Bind(&BrowserOptionsHandler::OnSigninAllowedPrefChange,
                  base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kEasyUnlockPairing,
       base::Bind(&BrowserOptionsHandler::SetupEasyUnlock,
                  base::Unretained(this)));
-
+  profile_pref_registrar_.Add(
+      prefs::kMetricsReportingEnabled,

[Alexei Svitkine (slow), 2014/08/28 14:46:49]

This code shouldn't be registering this pref. That's the responsibility of (and
already done in) MetricsStateManager.

[gayane -on leave until 09-2017, 2014/09/03 20:20:08]

Done.

+      base::Bind(&BrowserOptionsHandler::SetupMetricsReportingCheckbox,
+                 base::Unretained(this)));
 #if defined(OS_WIN)
   profile_pref_registrar_.Add(
       prefs::kURLsToRestoreOnStartup,
       base::Bind(&BrowserOptionsHandler::SetupExtensionControlledIndicators,
                  base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kHomePage,
       base::Bind(&BrowserOptionsHandler::SetupExtensionControlledIndicators,
                  base::Unretained(this)));
 #endif  // defined(OS_WIN)
@@ skipping 33 matching lines @@
   SetupMetricsReportingSettingVisibility();
   SetupNetworkPredictionControl();
   SetupFontSizeSelector();
   SetupPageZoomSelector();
   SetupAutoOpenFileTypes();
   SetupProxySettingsSection();
   SetupManageCertificatesSection();
   SetupManagingSupervisedUsers();
   SetupEasyUnlock();
   SetupExtensionControlledIndicators();
+  SetupMetricsReportingCheckbox();
 
 #if defined(OS_CHROMEOS)
   SetupAccessibilityFeatures();
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   if (!connector->IsEnterpriseManaged() &&
       !user_manager::UserManager::Get()->IsLoggedInAsGuest() &&
       !user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser()) {
     web_ui()->CallJavascriptFunction(
         "BrowserOptions.enableFactoryResetSection");
@@ skipping 919 matching lines @@
   // Check if an extension is overwriting the proxy setting.
   extension = extensions::GetExtensionOverridingProxy(
       Profile::FromWebUI(web_ui()));
   AppendExtensionData("proxy", extension, &extension_controlled);
 
   web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
                                    extension_controlled);
 #endif  // defined(OS_WIN)
 }
 
+void BrowserOptionsHandler::SetupMetricsReportingCheckbox() {
+  const PrefService* pref_service = g_browser_process->local_state();
+
+  base::FundamentalValue checked(pref_service->GetBoolean(
+      prefs::kMetricsReportingEnabled));

[Alexei Svitkine (slow), 2014/08/28 14:46:48]

This part should be done in chrome/browser/metrics and queried via an API, so
this code doesn't use the pref directly.

[gayane -on leave until 09-2017, 2014/09/03 20:20:08]

Done.

+  const PrefService::Preference* pref = pref_service->FindPreference(
+      prefs::kMetricsReportingEnabled);
+  base::FundamentalValue disabled(!(pref && pref->IsManaged()));
+
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.setMetricsReportingCheckboxState", checked, disabled);
+}
+
 }  // namespace options