Revert of Eliminate //chrome dependencies from MetricsServicesManager

chrome/browser/metrics/chrome_metrics_service_client.h

Index: chrome/browser/metrics/chrome_metrics_service_client.h
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h
index b79878fbdcef21feb7571e0778eacf6e5c51887e..b31bd776c0001dc93db398384768a631d5313688 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.h
+++ b/chrome/browser/metrics/chrome_metrics_service_client.h
@@ -29,6 +29,10 @@
 class SigninStatusMetricsProvider;
 #endif
 
+namespace base {
+class FilePath;
+}  // namespace base
+
 namespace metrics {
 class DriveMetricsProvider;
 class MetricsService;
@@ -54,7 +58,6 @@
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // metrics::MetricsServiceClient:
-  metrics::MetricsService* GetMetricsService() override;
   void SetMetricsClientId(const std::string& client_id) override;
   void OnRecordingDisabled() override;
   bool IsOffTheRecordSessionActive() override;
@@ -71,7 +74,10 @@
       const base::Callback<void(int)>& on_upload_complete) override;
   base::TimeDelta GetStandardUploadInterval() override;
   base::string16 GetRegistryBackupKey() override;
-  void OnPluginLoadingError(const base::FilePath& plugin_path) override;
+
+  metrics::MetricsService* metrics_service() { return metrics_service_.get(); }
+
+  void LogPluginLoadingError(const base::FilePath& plugin_path);
 
  private:
   explicit ChromeMetricsServiceClient(