Merge 94322 - Rewire the metrics pref to the signed settings store on chromeos.

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc	(revision 94348)
+++ chrome/browser/browser_main.cc	(working copy)
@@ -138,6 +138,7 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/brightness_observer.h"
+#include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
@@ -147,9 +148,9 @@
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/metrics_cros_settings_provider.h"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
 #include "chrome/browser/oom_priority_manager.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
@@ -618,7 +619,7 @@
   // non-official builds.
 #if defined(GOOGLE_CHROME_BUILD)
 #if defined(OS_CHROMEOS)
-  bool enabled = chromeos::MetricsCrosSettingsProvider::GetMetricsStatus();
+  bool enabled = chromeos::UserCrosSettingsProvider::cached_reporting_enabled();
 #else
   bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);
 #endif  // #if defined(OS_CHROMEOS)
@@ -1247,7 +1248,7 @@
       chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_STABLE;
   bool breakpad_enabled =
       !(is_guest_session && is_stable_channel) &&
-      chromeos::MetricsCrosSettingsProvider::GetMetricsStatus();
+      chromeos::UserCrosSettingsProvider::cached_reporting_enabled();
   if (!breakpad_enabled)
     breakpad_enabled = getenv(env_vars::kHeadless) != NULL;
 #else