Move metrics_service_accessor.cc to metrics component.

BUG=374199

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

Cr-Commit-Position: refs/heads/master@{#304282}

8 files changed, 19 insertions, 15 deletions

diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor.cc b/chrome/browser/metrics/chrome_metrics_service_accessor.cc
index 56cdfd3..271af31 100644
--- a/chrome/browser/metrics/chrome_metrics_service_accessor.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_accessor.cc
@@ -60,7 +60,7 @@ bool ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial(
 bool ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrialWithNameHash(
     uint32_t trial_name_hash,
     const std::string& group_name) {
-  return MetricsServiceAccessor::RegisterSyntheticFieldTrial(
+  return metrics::MetricsServiceAccessor::RegisterSyntheticFieldTrial(
       g_browser_process->metrics_service(),
       trial_name_hash,
       metrics::HashName(group_name));
diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor.h b/chrome/browser/metrics/chrome_metrics_service_accessor.h
index 975765b..4876c4f 100644
--- a/chrome/browser/metrics/chrome_metrics_service_accessor.h
+++ b/chrome/browser/metrics/chrome_metrics_service_accessor.h
@@ -11,7 +11,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "chrome/browser/metrics/metrics_reporting_state.h"
-#include "chrome/browser/metrics/metrics_service_accessor.h"
+#include "components/metrics/metrics_service_accessor.h"
 
 class ChromeExtensionDownloaderFactory;
 class PrefService;
@@ -47,7 +47,7 @@ class BrowserOptionsHandler;
 // 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 : public MetricsServiceAccessor {
+class ChromeMetricsServiceAccessor : public metrics::MetricsServiceAccessor {
  private:
   friend void component_updater::RegisterSwReporterComponent(
       component_updater::ComponentUpdateService* cus,
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 47e9dcd..b969e39 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -671,8 +671,6 @@
       'browser/metrics/jumplist_metrics_win.h',
       'browser/metrics/metrics_reporting_state.cc',
       'browser/metrics/metrics_reporting_state.h',
-      'browser/metrics/metrics_service_accessor.cc',
-      'browser/metrics/metrics_service_accessor.h',
       'browser/metrics/metrics_services_manager.cc',
       'browser/metrics/metrics_services_manager.h',
       'browser/metrics/network_stats_uploader.cc',
diff --git a/components/metrics.gypi b/components/metrics.gypi
index bd25e21..d510738 100644
--- a/components/metrics.gypi
+++ b/components/metrics.gypi
@@ -50,6 +50,8 @@
         'metrics/metrics_reporting_scheduler.h',
         'metrics/metrics_service.cc',
         'metrics/metrics_service.h',
+        'metrics/metrics_service_accessor.cc',
+        'metrics/metrics_service_accessor.h',
         'metrics/metrics_service_client.cc',
         'metrics/metrics_service_client.h',
         'metrics/metrics_state_manager.cc',
diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn
index 13c34a9..ae31a24 100644
--- a/components/metrics/BUILD.gn
+++ b/components/metrics/BUILD.gn
@@ -34,6 +34,8 @@ source_set("metrics") {
     "metrics_reporting_scheduler.h",
     "metrics_service.cc",
     "metrics_service.h",
+    "metrics_service_accessor.cc",
+    "metrics_service_accessor.h",
     "metrics_service_client.cc",
     "metrics_service_client.h",
     "metrics_state_manager.cc",
diff --git a/components/metrics/metrics_service.h b/components/metrics/metrics_service.h
index 19794ea..d9eef69 100644
--- a/components/metrics/metrics_service.h
+++ b/components/metrics/metrics_service.h
@@ -67,7 +67,7 @@ struct SyntheticTrialGroup {
 
  private:
   // Synthetic field trial users:
-  friend class ::MetricsServiceAccessor;
+  friend class MetricsServiceAccessor;
   friend class MetricsService;
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, RegisterSyntheticTrial);
 
diff --git a/chrome/browser/metrics/metrics_service_accessor.cc b/components/metrics/metrics_service_accessor.cc
index 1552368..515ce08 100644
--- a/chrome/browser/metrics/metrics_service_accessor.cc
+++ b/components/metrics/metrics_service_accessor.cc
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/metrics/metrics_service_accessor.h"
+#include "components/metrics/metrics_service_accessor.h"
 
 #include "components/metrics/metrics_service.h"
 
-// TODO(asvitkine): Remove when this class is moved to metrics namespace.
-using metrics::MetricsService;
-using metrics::SyntheticTrialGroup;
+namespace metrics {
 
 // static
 bool MetricsServiceAccessor::RegisterSyntheticFieldTrial(
@@ -22,3 +20,5 @@ bool MetricsServiceAccessor::RegisterSyntheticFieldTrial(
   metrics_service->RegisterSyntheticFieldTrial(trial_group);
   return true;
 }
+
+}  // namespace metrics
diff --git a/chrome/browser/metrics/metrics_service_accessor.h b/components/metrics/metrics_service_accessor.h
index 9d1438e..33315a9 100644
--- a/chrome/browser/metrics/metrics_service_accessor.h
+++ b/components/metrics/metrics_service_accessor.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_METRICS_METRICS_SERVICE_ACCESSOR_H_
-#define CHROME_BROWSER_METRICS_METRICS_SERVICE_ACCESSOR_H_
+#ifndef COMPONENTS_METRICS_METRICS_SERVICE_ACCESSOR_H_
+#define COMPONENTS_METRICS_METRICS_SERVICE_ACCESSOR_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 
 namespace metrics {
+
 class MetricsService;
-}
 
 // This class limits and documents access to metrics service helper methods.
 // These methods are protected so each user has to inherit own program-specific
@@ -27,7 +27,7 @@ class MetricsServiceAccessor {
   // NULL, returning true on success.
   // See the comment on MetricsService::RegisterSyntheticFieldTrial for details.
   static bool RegisterSyntheticFieldTrial(
-      metrics::MetricsService* metrics_service,
+      MetricsService* metrics_service,
       uint32_t trial_name_hash,
       uint32_t group_name_hash);
 
@@ -35,4 +35,6 @@ class MetricsServiceAccessor {
   DISALLOW_COPY_AND_ASSIGN(MetricsServiceAccessor);
 };
 
-#endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_ACCESSOR_H_
+}  // namespace metrics
+
+#endif  // COMPONENTS_METRICS_METRICS_SERVICE_ACCESSOR_H_