Rename MetricsServiceHelper to ChromeMetricsServiceAccessor.

Dependencies updated.

BUG=374202
R=isherman@chromium.org, thestig@chromium.org
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/289373007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272234 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_browser_metrics_service_observer.cc

@@ -4,15 +4,15 @@
 
 #include "chrome/browser/chrome_browser_metrics_service_observer.h"
 
-#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "net/base/network_change_notifier.h"
 
 ChromeBrowserMetricsServiceObserver::ChromeBrowserMetricsServiceObserver() {
-  MetricsServiceHelper::AddMetricsServiceObserver(this);
+  ChromeMetricsServiceAccessor::AddMetricsServiceObserver(this);
 }
 
 ChromeBrowserMetricsServiceObserver::~ChromeBrowserMetricsServiceObserver() {
-  MetricsServiceHelper::RemoveMetricsServiceObserver(this);
+  ChromeMetricsServiceAccessor::RemoveMetricsServiceObserver(this);
 }
 
 void ChromeBrowserMetricsServiceObserver::OnDidCreateMetricsLog() {

chrome/browser/extensions/api/metrics_private/metrics_private_api.cc

@@ -9,7 +9,7 @@
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
-#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/common/extensions/api/metrics_private.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/user_metrics.h"
@@ -41,7 +41,7 @@ const size_t kMaxBuckets = 10000; // We don't ever want more than these many
 
 bool MetricsPrivateGetIsCrashReportingEnabledFunction::RunSync() {
   SetResult(new base::FundamentalValue(
-      MetricsServiceHelper::IsCrashReportingEnabled()));
+      ChromeMetricsServiceAccessor::IsCrashReportingEnabled()));
   return true;
 }
 

chrome/browser/extensions/updater/extension_downloader.cc

@@ -24,7 +24,7 @@
 #include "chrome/browser/extensions/updater/extension_cache.h"
 #include "chrome/browser/extensions/updater/request_queue_impl.h"
 #include "chrome/browser/extensions/updater/safe_manifest_parser.h"
-#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ -343,7 +343,7 @@ bool ExtensionDownloader::AddExtensionData(const std::string& id,
   // If UMA is enabled, also add to ManifestFetchData for the
   // webstore update URL.
   if (!extension_urls::IsWebstoreUpdateUrl(update_url) &&
-      MetricsServiceHelper::IsMetricsReportingEnabled()) {
+      ChromeMetricsServiceAccessor::IsMetricsReportingEnabled()) {
     update_urls.push_back(extension_urls::GetWebstoreUpdateUrl());
   }
 

chrome/browser/extensions/updater/manifest_fetch_data.cc

@@ -11,7 +11,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/omaha_query_params/omaha_query_params.h"
 #include "net/base/escape.h"
 
@@ -103,7 +103,7 @@ bool ManifestFetchData::AddExtension(const std::string& id,
       if (ping_data->rollcall_days == kNeverPinged ||
           ping_data->rollcall_days > 0) {
         ping_value += "r=" + base::IntToString(ping_data->rollcall_days);
-        if (MetricsServiceHelper::IsMetricsReportingEnabled()) {
+        if (ChromeMetricsServiceAccessor::IsMetricsReportingEnabled()) {
           ping_value += "&e=" + std::string(ping_data->is_enabled ? "1" : "0");
         }
         pings_[id].rollcall_days = ping_data->rollcall_days;

chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc

@@ -8,7 +8,7 @@
 #include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/about_sync_util.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -94,7 +94,7 @@ void ChromeInternalLogSource::PopulateSyncLogs(SystemLogsResponse* response) {
 
 void ChromeInternalLogSource::PopulateExtensionInfoLogs(
     SystemLogsResponse* response) {
-  if (!MetricsServiceHelper::IsCrashReportingEnabled())
+  if (!ChromeMetricsServiceAccessor::IsCrashReportingEnabled())
     return;
 
   Profile* primary_profile =

chrome/browser/metrics/chrome_metrics_service_accessor.cc

+// Copyright 2014 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/metrics/chrome_metrics_service_accessor.h"
+
+#include "base/prefs/pref_service.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/common/pref_names.h"
+#include "components/metrics/metrics_service_observer.h"
+
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#endif
+
+// static
+bool ChromeMetricsServiceAccessor::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 ChromeMetricsServiceAccessor::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 ChromeMetricsServiceAccessor::IsMetricsReportingEnabled();
+#endif
+#else
+  return false;
+#endif
+}
+
+void ChromeMetricsServiceAccessor::AddMetricsServiceObserver(
+    MetricsServiceObserver* observer) {
+  MetricsService* metrics_service = g_browser_process->metrics_service();
+  if (metrics_service)
+    metrics_service->AddObserver(observer);
+}
+
+void ChromeMetricsServiceAccessor::RemoveMetricsServiceObserver(
+    MetricsServiceObserver* observer) {
+  MetricsService* metrics_service = g_browser_process->metrics_service();
+  if (metrics_service)
+    metrics_service->RemoveObserver(observer);
+}

chrome/browser/metrics/chrome_metrics_service_accessor.h

+// Copyright 2014 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.
+
+#ifndef CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_ACCESSOR_H_
+#define CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_ACCESSOR_H_
+
+#include "base/gtest_prod_util.h"
+#include "base/macros.h"
+
+class ChromeBrowserMetricsServiceObserver;
+class MetricsServiceObserver;
+class Profile;
+
+namespace {
+class CrashesDOMHandler;
+class FlashDOMHandler;
+}
+
+namespace extensions {
+class ExtensionDownloader;
+class ManifestFetchData;
+class MetricsPrivateGetIsCrashReportingEnabledFunction;
+}
+
+namespace prerender {
+bool IsOmniboxEnabled(Profile* profile);
+}
+
+namespace system_logs {
+class ChromeInternalLogSource;
+}
+
+// This class limits and documents access to metrics service helper methods.
+// Since these methods are private, each user has to be explicitly declared
+// as a 'friend' below.
+class ChromeMetricsServiceAccessor {
+ private:
+  friend bool prerender::IsOmniboxEnabled(Profile* profile);
+  friend class ::ChromeBrowserMetricsServiceObserver;
+  friend class ChromeRenderMessageFilter;
+  friend class ::CrashesDOMHandler;
+  friend class extensions::ExtensionDownloader;
+  friend class extensions::ManifestFetchData;
+  friend class extensions::MetricsPrivateGetIsCrashReportingEnabledFunction;
+  friend class ::FlashDOMHandler;
+  friend class system_logs::ChromeInternalLogSource;
+
+  FRIEND_TEST_ALL_PREFIXES(ChromeMetricsServiceAccessorTest,
+                           MetricsReportingEnabled);
+  FRIEND_TEST_ALL_PREFIXES(ChromeMetricsServiceAccessorTest,
+                           CrashReportingEnabled);
+
+  // Returns true if prefs::kMetricsReportingEnabled is set.
+  // TODO(asvitkine): Consolidate the method in MetricsStateManager.
+  // TODO(asvitkine): This function does not report the correct value on
+  // Android and ChromeOS, see http://crbug.com/362192.
+  static bool IsMetricsReportingEnabled();
+
+  // Returns true if crash reporting is enabled.  This is set at the platform
+  // level for Android and ChromeOS, and otherwise is the same as
+  // IsMetricsReportingEnabled for desktop Chrome.
+  static bool IsCrashReportingEnabled();
+
+  // Registers/unregisters |observer| to receive MetricsLog notifications
+  // from metrics service.
+  static void AddMetricsServiceObserver(MetricsServiceObserver* observer);
+  static void RemoveMetricsServiceObserver(MetricsServiceObserver* observer);
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(ChromeMetricsServiceAccessor);
+};
+
+#endif  // CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_ACCESSOR_H_

chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc

+// Copyright 2014 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/metrics/chrome_metrics_service_accessor.h"
+
+#include "chrome/common/pref_names.h"
+#include "chrome/test/base/scoped_testing_local_state.h"
+#include "chrome/test/base/testing_browser_process.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class ChromeMetricsServiceAccessorTest : public testing::Test {
+ public:
+  ChromeMetricsServiceAccessorTest()
+      : testing_local_state_(TestingBrowserProcess::GetGlobal()) {
+  }
+
+  PrefService* GetLocalState() {
+    return testing_local_state_.Get();
+  }
+
+ private:
+  ScopedTestingLocalState testing_local_state_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeMetricsServiceAccessorTest);
+};
+
+TEST_F(ChromeMetricsServiceAccessorTest, MetricsReportingEnabled) {
+#if !defined(OS_CHROMEOS)
+  GetLocalState()->SetBoolean(prefs::kMetricsReportingEnabled, false);
+  EXPECT_FALSE(ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
+  GetLocalState()->SetBoolean(prefs::kMetricsReportingEnabled, true);
+  EXPECT_TRUE(ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
+  GetLocalState()->ClearPref(prefs::kMetricsReportingEnabled);
+  EXPECT_FALSE(ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
+#else
+  // ChromeOS does not register prefs::kMetricsReportingEnabled and uses
+  // device settings for metrics reporting.
+  EXPECT_FALSE(ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
+#endif
+}
+
+TEST_F(ChromeMetricsServiceAccessorTest, CrashReportingEnabled) {
+#if defined(GOOGLE_CHROME_BUILD)
+// ChromeOS has different device settings for crash reporting.
+#if !defined(OS_CHROMEOS)
+#if defined(OS_ANDROID)
+  const char* crash_pref = prefs::kCrashReportingEnabled;
+#else
+  const char* crash_pref = prefs::kMetricsReportingEnabled;
+#endif
+  GetLocalState()->SetBoolean(crash_pref, false);
+  EXPECT_FALSE(ChromeMetricsServiceAccessor::IsCrashReportingEnabled());
+  GetLocalState()->SetBoolean(crash_pref, true);
+  EXPECT_TRUE(ChromeMetricsServiceAccessor::IsCrashReportingEnabled());
+  GetLocalState()->ClearPref(crash_pref);
+  EXPECT_FALSE(ChromeMetricsServiceAccessor::IsCrashReportingEnabled());
+#endif  // !defined(OS_CHROMEOS)
+#else  // defined(GOOGLE_CHROME_BUILD)
+  // Chromium branded browsers never have crash reporting enabled.
+  EXPECT_FALSE(ChromeMetricsServiceAccessor::IsCrashReportingEnabled());
+#endif  // defined(GOOGLE_CHROME_BUILD)
+}

chrome/browser/metrics/metrics_service.cc

@@ -1762,51 +1762,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);
-}

chrome/browser/metrics/metrics_service.h

@@ -35,18 +35,10 @@
 #include "content/public/browser/user_metrics.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
-class ChromeBrowserMetricsServiceObserver;
 class GoogleUpdateMetricsProviderWin;
 class MetricsReportingScheduler;
 class PrefService;
 class PrefRegistrySimple;
-class Profile;
-class TemplateURLService;
-
-namespace {
-class CrashesDOMHandler;
-class FlashDOMHandler;
-}
 
 namespace base {
 class DictionaryValue;
@@ -63,12 +55,6 @@ class WebContents;
 struct WebPluginInfo;
 }
 
-namespace extensions {
-class ExtensionDownloader;
-class ManifestFetchData;
-class MetricsPrivateGetIsCrashReportingEnabledFunction;
-}
-
 namespace metrics {
 class MetricsServiceClient;
 class MetricsStateManager;
@@ -78,14 +64,6 @@ namespace net {
 class URLFetcher;
 }
 
-namespace prerender {
-bool IsOmniboxEnabled(Profile* profile);
-}
-
-namespace system_logs {
-class ChromeInternalLogSource;
-}
-
 namespace tracked_objects {
 struct ProcessDataSnapshot;
 }
@@ -570,7 +548,7 @@ class MetricsService
   // Confirms single-threaded access to |observers_| in debug builds.
   base::ThreadChecker thread_checker_;
 
-  friend class MetricsServiceHelper;
+  friend class ChromeMetricsServiceAccessor;
 
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, IsPluginProcess);
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, MetricsServiceObserver);
@@ -581,40 +559,4 @@ class MetricsService
   DISALLOW_COPY_AND_ASSIGN(MetricsService);
 };
 
-// This class limits and documents access to metrics service helper methods.
-// Since these methods are private, each user has to be explicitly declared
-// as a 'friend' below.
-class MetricsServiceHelper {
- private:
-  friend bool prerender::IsOmniboxEnabled(Profile* profile);
-  friend class ::ChromeBrowserMetricsServiceObserver;
-  friend class ChromeRenderMessageFilter;
-  friend class ::CrashesDOMHandler;
-  friend class extensions::ExtensionDownloader;
-  friend class extensions::ManifestFetchData;
-  friend class extensions::MetricsPrivateGetIsCrashReportingEnabledFunction;
-  friend class ::FlashDOMHandler;
-  friend class system_logs::ChromeInternalLogSource;
-  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, MetricsReportingEnabled);
-  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, CrashReportingEnabled);
-
-  // Returns true if prefs::kMetricsReportingEnabled is set.
-  // TODO(asvitkine): Consolidate the method in MetricsStateManager.
-  // TODO(asvitkine): This function does not report the correct value on
-  // Android and ChromeOS, see http://crbug.com/362192.
-  static bool IsMetricsReportingEnabled();
-
-  // Returns true if crash reporting is enabled.  This is set at the platform
-  // level for Android and ChromeOS, and otherwise is the same as
-  // IsMetricsReportingEnabled for desktop Chrome.
-  static bool IsCrashReportingEnabled();
-
-  // Registers/unregisters |observer| to receive MetricsLog notifications
-  // from metrics service.
-  static void AddMetricsServiceObserver(MetricsServiceObserver* observer);
-  static void RemoveMetricsServiceObserver(MetricsServiceObserver* observer);
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(MetricsServiceHelper);
-};
-
 #endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_H_

chrome/browser/metrics/metrics_service_unittest.cc

@@ -308,43 +308,6 @@ TEST_F(MetricsServiceTest, RegisterSyntheticTrial) {
   service.log_manager_.FinishCurrentLog();
 }
 
-TEST_F(MetricsServiceTest, MetricsReportingEnabled) {
-#if !defined(OS_CHROMEOS)
-  GetLocalState()->SetBoolean(prefs::kMetricsReportingEnabled, false);
-  EXPECT_FALSE(MetricsServiceHelper::IsMetricsReportingEnabled());
-  GetLocalState()->SetBoolean(prefs::kMetricsReportingEnabled, true);
-  EXPECT_TRUE(MetricsServiceHelper::IsMetricsReportingEnabled());
-  GetLocalState()->ClearPref(prefs::kMetricsReportingEnabled);
-  EXPECT_FALSE(MetricsServiceHelper::IsMetricsReportingEnabled());
-#else
-  // ChromeOS does not register prefs::kMetricsReportingEnabled and uses
-  // device settings for metrics reporting.
-  EXPECT_FALSE(MetricsServiceHelper::IsMetricsReportingEnabled());
-#endif
-}
-
-TEST_F(MetricsServiceTest, CrashReportingEnabled) {
-#if defined(GOOGLE_CHROME_BUILD)
-// ChromeOS has different device settings for crash reporting.
-#if !defined(OS_CHROMEOS)
-#if defined(OS_ANDROID)
-  const char* crash_pref = prefs::kCrashReportingEnabled;
-#else
-  const char* crash_pref = prefs::kMetricsReportingEnabled;
-#endif
-  GetLocalState()->SetBoolean(crash_pref, false);
-  EXPECT_FALSE(MetricsServiceHelper::IsCrashReportingEnabled());
-  GetLocalState()->SetBoolean(crash_pref, true);
-  EXPECT_TRUE(MetricsServiceHelper::IsCrashReportingEnabled());
-  GetLocalState()->ClearPref(crash_pref);
-  EXPECT_FALSE(MetricsServiceHelper::IsCrashReportingEnabled());
-#endif  // !defined(OS_CHROMEOS)
-#else  // defined(GOOGLE_CHROME_BUILD)
-  // Chromium branded browsers never have crash reporting enabled.
-  EXPECT_FALSE(MetricsServiceHelper::IsCrashReportingEnabled());
-#endif  // defined(GOOGLE_CHROME_BUILD)
-}
-
 TEST_F(MetricsServiceTest, MetricsServiceObserver) {
   metrics::TestMetricsServiceClient client;
   MetricsService service(GetMetricsStateManager(), &client);

chrome/browser/renderer_host/chrome_render_message_filter.cc

@@ -19,7 +19,7 @@
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/api/messaging/message_service.h"
-#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -475,5 +475,5 @@ void ChromeRenderMessageFilter::OnCanTriggerClipboardWrite(
 }
 
 void ChromeRenderMessageFilter::OnIsCrashReportingEnabled(bool* enabled) {
-  *enabled = MetricsServiceHelper::IsCrashReportingEnabled();
+  *enabled = ChromeMetricsServiceAccessor::IsCrashReportingEnabled();
 }

chrome/browser/ui/webui/crashes_ui.cc

@@ -13,7 +13,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/crash_upload_list.h"
-#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
@@ -152,7 +152,7 @@ void CrashesDOMHandler::OnUploadListAvailable() {
 
 void CrashesDOMHandler::UpdateUI() {
   bool crash_reporting_enabled =
-      MetricsServiceHelper::IsCrashReportingEnabled();
+      ChromeMetricsServiceAccessor::IsCrashReportingEnabled();
   base::ListValue crash_list;
   bool system_crash_reporter = false;
 

chrome/browser/ui/webui/flash_ui.cc

@@ -20,7 +20,7 @@
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/crash_upload_list.h"
-#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_version_info.h"
@@ -299,7 +299,7 @@ void FlashDOMHandler::MaybeRespondToPage() {
   // Crash information.
   AddPair(list, base::string16(), "--- Crash data ---");
   bool crash_reporting_enabled =
-      MetricsServiceHelper::IsCrashReportingEnabled();
+      ChromeMetricsServiceAccessor::IsCrashReportingEnabled();
   if (crash_reporting_enabled) {
     std::vector<CrashUploadList::UploadInfo> crashes;
     upload_list_->GetUploads(10, &crashes);

chrome/chrome_browser.gypi

@@ -1185,6 +1185,8 @@
         'browser/memory_details_win.cc',
         'browser/metrics/chrome_browser_main_extra_parts_metrics.cc',
         'browser/metrics/chrome_browser_main_extra_parts_metrics.h',
+        'browser/metrics/chrome_metrics_service_accessor.cc',
+        'browser/metrics/chrome_metrics_service_accessor.h',
         'browser/metrics/chrome_metrics_service_client.cc',
         'browser/metrics/chrome_metrics_service_client.h',
         'browser/metrics/compression_utils.cc',

chrome/chrome_tests_unit.gypi

@@ -1078,6 +1078,7 @@
         'browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc',
         'browser/media_galleries/media_scan_manager_unittest.cc',
         'browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc',
+        'browser/metrics/chrome_metrics_service_accessor_unittest.cc',
         'browser/metrics/cloned_install_detector_unittest.cc',
         'browser/metrics/compression_utils_unittest.cc',
         'browser/metrics/extension_metrics_unittest.cc',