Componentize OmniboxMetricsProvider for sharing with iOS

The class has no problematic dependencies, so componentization is
straightforward.

BUG=508022

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

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

7 files changed, 12 insertions, 8 deletions

diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index 63a7cbd..2a1a126 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/metrics/chrome_stability_metrics_provider.h"
-#include "chrome/browser/metrics/omnibox_metrics_provider.h"
 #include "chrome/browser/metrics/time_ticks_experiment_win.h"
 #include "chrome/browser/process_resource_usage.h"
 #include "chrome/browser/ui/browser_otr_state.h"
@@ -40,6 +39,7 @@
 #include "components/metrics/profiler/profiler_metrics_provider.h"
 #include "components/metrics/profiler/tracking_synchronizer.h"
 #include "components/metrics/url_constants.h"
+#include "components/omnibox/browser/omnibox_metrics_provider.h"
 #include "components/variations/variations_associated_data.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cb00a0c..d2f131b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1846,8 +1846,6 @@
       'browser/metrics/metrics_reporting_state.h',
       'browser/metrics/metrics_services_manager.cc',
       'browser/metrics/metrics_services_manager.h',
-      'browser/metrics/omnibox_metrics_provider.cc',
-      'browser/metrics/omnibox_metrics_provider.h',
       'browser/metrics/perf_provider_chromeos.cc',
       'browser/metrics/perf_provider_chromeos.h',
       'browser/metrics/signin_status_metrics_provider.cc',
diff --git a/components/omnibox.gypi b/components/omnibox.gypi
index 572e9e4..a63d057 100644
--- a/components/omnibox.gypi
+++ b/components/omnibox.gypi
@@ -19,6 +19,7 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../url/url.gyp:url_lib',
         'bookmarks_browser',
+        'metrics',
         'component_metrics_proto',
         'components_resources.gyp:components_resources',
         'components_strings.gyp:components_strings',
@@ -99,6 +100,8 @@
         'omnibox/browser/omnibox_field_trial.h',
         'omnibox/browser/omnibox_log.cc',
         'omnibox/browser/omnibox_log.h',
+        'omnibox/browser/omnibox_metrics_provider.cc',
+        'omnibox/browser/omnibox_metrics_provider.h',
         'omnibox/browser/omnibox_navigation_observer.h',
         'omnibox/browser/omnibox_popup_model.cc',
         'omnibox/browser/omnibox_popup_model.h',
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index 5cc7167..67a8c9a 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -59,6 +59,8 @@ source_set("browser") {
     "omnibox_field_trial.h",
     "omnibox_log.cc",
     "omnibox_log.h",
+    "omnibox_metrics_provider.cc",
+    "omnibox_metrics_provider.h",
     "omnibox_navigation_observer.h",
     "omnibox_popup_model.cc",
     "omnibox_popup_model.h",
@@ -106,6 +108,7 @@ source_set("browser") {
     "//base:prefs",
     "//components/bookmarks/browser",
     "//components/keyed_service/core",
+    "//components/metrics",
     "//components/omnibox/common",
     "//components/open_from_clipboard",
     "//components/pref_registry",
diff --git a/components/omnibox/browser/DEPS b/components/omnibox/browser/DEPS
index 480cab6..4132e8a 100644
--- a/components/omnibox/browser/DEPS
+++ b/components/omnibox/browser/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "+components/bookmarks/browser",
   "+components/history/core/browser",
   "+components/keyed_service/core",
-  "+components/metrics/proto",
+  "+components/metrics",
   "+components/open_from_clipboard",
   "+components/pref_registry",
   "+components/query_parser",
diff --git a/chrome/browser/metrics/omnibox_metrics_provider.cc b/components/omnibox/browser/omnibox_metrics_provider.cc
index 499ce6f..3f6ddf5 100644
--- a/chrome/browser/metrics/omnibox_metrics_provider.cc
+++ b/components/omnibox/browser/omnibox_metrics_provider.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/metrics/omnibox_metrics_provider.h"
+#include "components/omnibox/browser/omnibox_metrics_provider.h"
 
 #include <vector>
 
diff --git a/chrome/browser/metrics/omnibox_metrics_provider.h b/components/omnibox/browser/omnibox_metrics_provider.h
index fc86adf..11cb5f5 100644
--- a/chrome/browser/metrics/omnibox_metrics_provider.h
+++ b/components/omnibox/browser/omnibox_metrics_provider.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_OMNIBOX_METRICS_PROVIDER_H_
-#define CHROME_BROWSER_METRICS_OMNIBOX_METRICS_PROVIDER_H_
+#ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_METRICS_PROVIDER_H_
+#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_METRICS_PROVIDER_H_
 
 #include "base/basictypes.h"
 #include "components/metrics/metrics_provider.h"
@@ -48,4 +48,4 @@ class OmniboxMetricsProvider : public metrics::MetricsProvider {
   DISALLOW_COPY_AND_ASSIGN(OmniboxMetricsProvider);
 };
 
-#endif  // CHROME_BROWSER_METRICS_OMNIBOX_METRICS_PROVIDER_H_
+#endif  // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_METRICS_PROVIDER_H_