Revert of Reduce plugin_metrics_provider_ usage in MetricsService (https://codereview.chromium.org/308433004/)

Reason for revert:
This CL seems to cause bot failure on CI:
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Tests%20%281%29/builds/2745

Original issue's description:
> Reduce plugin_metrics_provider_ usage in MetricsService
> 
> This CL eliminates MetricsService's call to
> PluginMetricsProvider::RecordPluginChanges (replaced by a new API on
> MetricsProvider). It additionally adds a
> MetricsServicesManager::OnPluginLoadingError() API and has the plugin observer
> call that API rather than calling MetricsService directly. This change will
> enable easily moving MetricsService::LogPluginLoadingError() to
> ChromeMetricsServiceClient once the latter is the class that keeps a weak
> pointer to the plugin metrics provider.
> 
> BUG=375776
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=274403

TBR=asvitkine@chromium.org,isherman@chromium.org,jochen@chromium.org,blundell@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=375776

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274418 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 30f1c08..33969aa 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -423,13 +423,6 @@ void BrowserProcessImpl::EndSession() {
 #endif
 }
 
-MetricsServicesManager* BrowserProcessImpl::GetMetricsServicesManager() {
-  DCHECK(CalledOnValidThread());
-  if (!metrics_services_manager_)
-    metrics_services_manager_.reset(new MetricsServicesManager(local_state()));
-  return metrics_services_manager_.get();
-}
-
 MetricsService* BrowserProcessImpl::metrics_service() {
   DCHECK(CalledOnValidThread());
   return GetMetricsServicesManager()->GetMetricsService();
@@ -993,6 +986,13 @@ void BrowserProcessImpl::CreateSafeBrowsingService() {
 #endif
 }
 
+MetricsServicesManager* BrowserProcessImpl::GetMetricsServicesManager() {
+  DCHECK(CalledOnValidThread());
+  if (!metrics_services_manager_)
+    metrics_services_manager_.reset(new MetricsServicesManager(local_state()));
+  return metrics_services_manager_.get();
+}
+
 void BrowserProcessImpl::ApplyDefaultBrowserPolicy() {
   if (local_state()->GetBoolean(prefs::kDefaultBrowserSettingEnabled)) {
     scoped_refptr<ShellIntegration::DefaultWebClientWorker>