| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index 36a98802b298811f6722a697e4bb8cc97e2b3752..3a32c30cacf78a3bbfbf6f9140a25c2c83055eb5 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -131,6 +131,7 @@
|
| #include "chrome/browser/chromeos/audio_handler.h"
|
| #include "chrome/browser/chromeos/boot_times_loader.h"
|
| #include "chrome/browser/chromeos/brightness_observer.h"
|
| +#include "chrome/browser/chromeos/cros_settings.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"
|
| @@ -143,7 +144,6 @@
|
| #include "chrome/browser/chromeos/login/screen_locker.h"
|
| #include "chrome/browser/chromeos/login/user_manager.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"
|
| @@ -634,9 +634,12 @@ bool IsCrashReportingEnabled(const PrefService* local_state) {
|
| CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);
|
| bool is_stable_channel =
|
| chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_STABLE;
|
| + // TODO(pastarmovj): Consider the TrustedGet here.
|
| + bool reporting_enabled;
|
| + chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
|
| + &reporting_enabled);
|
| bool breakpad_enabled =
|
| - !(is_guest_session && is_stable_channel) &&
|
| - chromeos::UserCrosSettingsProvider::cached_reporting_enabled();
|
| + !(is_guest_session && is_stable_channel) && reporting_enabled;
|
| if (!breakpad_enabled)
|
| breakpad_enabled = getenv(env_vars::kHeadless) != NULL;
|
| #else
|
| @@ -1117,7 +1120,9 @@ MetricsService* ChromeBrowserMainParts::InitializeMetrics(
|
| // non-official builds.
|
| #if defined(GOOGLE_CHROME_BUILD)
|
| #if defined(OS_CHROMEOS)
|
| - bool enabled = chromeos::UserCrosSettingsProvider::cached_reporting_enabled();
|
| + bool enabled;
|
| + chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
|
| + &enabled);
|
| #else
|
| bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);
|
| #endif // #if defined(OS_CHROMEOS)
|
|
|