| Index: chrome/browser/metrics/metrics_service.cc
|
| diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
|
| index ba241200d66286c5d16c552e21b25b5cc08a0ce8..a186db1e95addfe881c61ed5b37a94ada5b55b86 100644
|
| --- a/chrome/browser/metrics/metrics_service.cc
|
| +++ b/chrome/browser/metrics/metrics_service.cc
|
| @@ -1914,51 +1914,3 @@ bool MetricsService::IsPluginProcess(int process_type) {
|
| process_type == content::PROCESS_TYPE_PPAPI_PLUGIN ||
|
| process_type == content::PROCESS_TYPE_PPAPI_BROKER);
|
| }
|
| -
|
| -// static
|
| -bool MetricsServiceHelper::IsMetricsReportingEnabled() {
|
| - bool result = false;
|
| - const PrefService* local_state = g_browser_process->local_state();
|
| - if (local_state) {
|
| - const PrefService::Preference* uma_pref =
|
| - local_state->FindPreference(prefs::kMetricsReportingEnabled);
|
| - if (uma_pref) {
|
| - bool success = uma_pref->GetValue()->GetAsBoolean(&result);
|
| - DCHECK(success);
|
| - }
|
| - }
|
| - return result;
|
| -}
|
| -
|
| -bool MetricsServiceHelper::IsCrashReportingEnabled() {
|
| -#if defined(GOOGLE_CHROME_BUILD)
|
| -#if defined(OS_CHROMEOS)
|
| - bool reporting_enabled = false;
|
| - chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
|
| - &reporting_enabled);
|
| - return reporting_enabled;
|
| -#elif defined(OS_ANDROID)
|
| - // Android has its own settings for metrics / crash uploading.
|
| - const PrefService* prefs = g_browser_process->local_state();
|
| - return prefs->GetBoolean(prefs::kCrashReportingEnabled);
|
| -#else
|
| - return MetricsServiceHelper::IsMetricsReportingEnabled();
|
| -#endif
|
| -#else
|
| - return false;
|
| -#endif
|
| -}
|
| -
|
| -void MetricsServiceHelper::AddMetricsServiceObserver(
|
| - MetricsServiceObserver* observer) {
|
| - MetricsService* metrics_service = g_browser_process->metrics_service();
|
| - if (metrics_service)
|
| - metrics_service->AddObserver(observer);
|
| -}
|
| -
|
| -void MetricsServiceHelper::RemoveMetricsServiceObserver(
|
| - MetricsServiceObserver* observer) {
|
| - MetricsService* metrics_service = g_browser_process->metrics_service();
|
| - if (metrics_service)
|
| - metrics_service->RemoveObserver(observer);
|
| -}
|
|
|