[Metrics] Move MetricsServiceObserver into //components/metrics

BUG=374204
TEST=compiles
R=asvitkine@chromium.org, blundell@chromium.org
TBR=thestig@chromium.org

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

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

chrome/browser/chrome_browser_metrics_service_observer.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_METRICS_SERVICE_OBSERVER_H_
 #define CHROME_BROWSER_CHROME_BROWSER_METRICS_SERVICE_OBSERVER_H_
 
-#include "chrome/browser/metrics/metrics_service_observer.h"
+#include "components/metrics/metrics_service_observer.h"
 
 // ChromeBrowserMetricsServiceObserver receives notifications when the metrics
 // service creates a new metrics log.

chrome/browser/metrics/metrics_service.h

@@ -23,10 +23,10 @@
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "chrome/browser/metrics/metrics_log.h"
-#include "chrome/browser/metrics/metrics_service_observer.h"
 #include "chrome/browser/metrics/tracking_synchronizer_observer.h"
 #include "chrome/common/metrics/metrics_service_base.h"
 #include "chrome/installer/util/google_update_settings.h"
+#include "components/metrics/metrics_service_observer.h"
 #include "components/variations/active_field_trials.h"
 #include "content/public/browser/browser_child_process_observer.h"
 #include "content/public/browser/notification_observer.h"

chrome/browser/metrics/metrics_service_unittest.cc

@@ -8,12 +8,12 @@
 
 #include "base/command_line.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/browser/metrics/metrics_service_observer.h"
 #include "chrome/browser/metrics/metrics_state_manager.h"
 #include "chrome/common/chrome_switches.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 "components/metrics/metrics_service_observer.h"
 #include "components/variations/metrics_util.h"
 #include "content/public/common/process_type.h"
 #include "content/public/common/webplugininfo.h"

chrome/chrome_browser.gypi

@@ -1204,8 +1204,6 @@
         'browser/metrics/metrics_reporting_scheduler.cc',
         'browser/metrics/metrics_reporting_scheduler.h',
         'browser/metrics/metrics_service_android.cc',
-        'browser/metrics/metrics_service_observer.cc',
-        'browser/metrics/metrics_service_observer.h',
         'browser/metrics/metrics_service.cc',
         'browser/metrics/metrics_service.h',
         'browser/metrics/metrics_services_manager.cc',

components/metrics.gypi

@@ -24,6 +24,8 @@
         'metrics/metrics_pref_names.cc',
         'metrics/metrics_pref_names.h',
         'metrics/metrics_service_client.h',
+        'metrics/metrics_service_observer.cc',
+        'metrics/metrics_service_observer.h',
         'metrics/persisted_logs.cc',
         'metrics/persisted_logs.h',
       ],

chrome/browser/metrics/metrics_service_observer.cc → components/metrics/metrics_service_observer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chrome_browser_metrics_service_observer.h"
+#include "components/metrics/metrics_service_observer.h"
 
 MetricsServiceObserver::MetricsServiceObserver() {
 }

chrome/browser/metrics/metrics_service_observer.h → components/metrics/metrics_service_observer.h

@@ -2,8 +2,8 @@
 // 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_OBSERVER_H_
-#define CHROME_BROWSER_METRICS_METRICS_SERVICE_OBSERVER_H_
+#ifndef COMPONENTS_METRICS_METRICS_SERVICE_OBSERVER_H_
+#define COMPONENTS_METRICS_METRICS_SERVICE_OBSERVER_H_
 
 #include "base/macros.h"
 
@@ -22,4 +22,4 @@ class MetricsServiceObserver {
   DISALLOW_COPY_AND_ASSIGN(MetricsServiceObserver);
 };
 
-#endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_OBSERVER_H_
+#endif  // COMPONENTS_METRICS_METRICS_SERVICE_OBSERVER_H_