7 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/chrome_browser_metrics_service_observer.h b/chrome/browser/chrome_browser_metrics_service_observer.h
index db2f0d4..111cca7 100644
--- a/chrome/browser/chrome_browser_metrics_service_observer.h
+++ b/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.
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 6821615..af17cc4 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/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"
diff --git a/chrome/browser/metrics/metrics_service_unittest.cc b/chrome/browser/metrics/metrics_service_unittest.cc
index 11ac829..771cc1e 100644
--- a/chrome/browser/metrics/metrics_service_unittest.cc
+++ b/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"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d1c0021..2566e21 100644
--- a/chrome/chrome_browser.gypi
+++ b/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',
diff --git a/components/metrics.gypi b/components/metrics.gypi
index 78e7a3c..8a058eb 100644
--- a/components/metrics.gypi
+++ b/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',
       ],
diff --git a/chrome/browser/metrics/metrics_service_observer.cc b/components/metrics/metrics_service_observer.cc
index 754c10f..576ca3b 100644
--- a/chrome/browser/metrics/metrics_service_observer.cc
+++ b/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() {
 }
diff --git a/chrome/browser/metrics/metrics_service_observer.h b/components/metrics/metrics_service_observer.h
index 1eaec30..510487e 100644
--- a/chrome/browser/metrics/metrics_service_observer.h
+++ b/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_