Eliminate //chrome dependencies from MetricsServicesManager

components/metrics/metrics_service_client.h

Index: components/metrics/metrics_service_client.h
diff --git a/components/metrics/metrics_service_client.h b/components/metrics/metrics_service_client.h
index 4cbebda48ce0bd332b501028a89a389ea7c3fdcf..0b1e2cd34672a189eeb6160bffa46c0567e6359e 100644
--- a/components/metrics/metrics_service_client.h
+++ b/components/metrics/metrics_service_client.h
@@ -15,9 +15,14 @@
 #include "base/time/time.h"
 #include "components/metrics/proto/system_profile.pb.h"
 
+namespace base {
+class FilePath;
+}
+
 namespace metrics {
 
 class MetricsLogUploader;
+class MetricsService;
 
 // An abstraction of operations that depend on the embedder's (e.g. Chrome)
 // environment.
@@ -25,6 +30,12 @@ class MetricsServiceClient {
  public:
   virtual ~MetricsServiceClient() {}
 
+  // Returns the MetricsService instance that this client is associated with.
+  // With the exception of testing contexts, the returned instance must be valid
+  // for the lifetime of this object (typically, the embedder's client
+  // implementation will own the MetricsService instance being returned).
+  virtual metrics::MetricsService* GetMetricsService() = 0;

[Alexei Svitkine (slow), 2015/10/20 15:02:20]

Nit: Remove metrics:: since this is in it.

+
   // Registers the client id with other services (e.g. crash reporting), called
   // when metrics recording gets enabled.
   virtual void SetMetricsClientId(const std::string& client_id) = 0;
@@ -79,6 +90,9 @@ class MetricsServiceClient {
   // Returns the name of a key under HKEY_CURRENT_USER that can be used to store
   // backups of metrics data. Unused except on Windows.
   virtual base::string16 GetRegistryBackupKey();
+
+  // Called on plugin loading errors.
+  virtual void OnPluginLoadingError(const base::FilePath& plugin_path) {}
 };
 
 }  // namespace metrics