Revert of Eliminate //chrome dependencies from MetricsServicesManager

chrome/browser/metrics/chrome_metrics_service_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 161 matching lines @@
 
 #if defined(OS_ANDROID)
   AndroidMetricsProvider::RegisterPrefs(registry);
 #endif  // defined(OS_ANDROID)
 
 #if defined(ENABLE_PLUGINS)
   PluginMetricsProvider::RegisterPrefs(registry);
 #endif  // defined(ENABLE_PLUGINS)
 }
 
-metrics::MetricsService* ChromeMetricsServiceClient::GetMetricsService() {
-  return metrics_service_.get();
-}
-
 void ChromeMetricsServiceClient::SetMetricsClientId(
     const std::string& client_id) {
   crash_keys::SetMetricsClientIdFromGUID(client_id);
 }
 
 void ChromeMetricsServiceClient::OnRecordingDisabled() {
   crash_keys::ClearMetricsClientId();
 }
 
 bool ChromeMetricsServiceClient::IsOffTheRecordSessionActive() {
@@ skipping 77 matching lines @@
 }
 
 base::string16 ChromeMetricsServiceClient::GetRegistryBackupKey() {
 #if defined(OS_WIN)
   return L"Software\\" PRODUCT_STRING_PATH L"\\StabilityMetrics";
 #else
   return base::string16();
 #endif
 }
 
-void ChromeMetricsServiceClient::OnPluginLoadingError(
+void ChromeMetricsServiceClient::LogPluginLoadingError(
     const base::FilePath& plugin_path) {
 #if defined(ENABLE_PLUGINS)
   plugin_metrics_provider_->LogPluginLoadingError(plugin_path);
 #else
   NOTREACHED();
 #endif  // defined(ENABLE_PLUGINS)
 }
 
 void ChromeMetricsServiceClient::Initialize() {
   // Clear metrics reports if it is the first time cellular upload logic should
@@ skipping 309 matching lines @@
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 void ChromeMetricsServiceClient::OnURLOpenedFromOmnibox(OmniboxLog* log) {
   metrics_service_->OnApplicationNotIdle();
 }