Move initial metrics gathering tasks out of MetricsService.

chrome/browser/metrics/metrics_services_manager.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/metrics_services_manager.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/metrics_service.h"
@@ skipping 10 matching lines @@
 MetricsServicesManager::MetricsServicesManager(PrefService* local_state)
     : local_state_(local_state) {
   DCHECK(local_state);
 }
 
 MetricsServicesManager::~MetricsServicesManager() {
 }
 
 MetricsService* MetricsServicesManager::GetMetricsService() {
   DCHECK(thread_checker_.CalledOnValidThread());
+  return GetMetricsServiceClient()->metrics_service();
+}
+
+ChromeMetricsServiceClient* MetricsServicesManager::GetMetricsServiceClient() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (!metrics_service_client_) {
     metrics_service_client_ =
         ChromeMetricsServiceClient::Create(GetMetricsStateManager()).Pass();
   }
-  return metrics_service_client_->metrics_service();
+  return metrics_service_client_.get();
+}
+
+PluginMetricsProvider* MetricsServicesManager::GetPluginMetricsProvider() {
+  return GetMetricsServiceClient()->plugin_metrics_provider();
 }
 
 rappor::RapporService* MetricsServicesManager::GetRapporService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!rappor_service_)
     rappor_service_.reset(new rappor::RapporService);
   return rappor_service_.get();
 }
 
 chrome_variations::VariationsService*
@@ skipping 31 matching lines @@
 #if defined(GOOGLE_CHROME_BUILD)
 #if defined(OS_CHROMEOS)
   chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
                                             &enabled);
 #else
   enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled);
 #endif  // #if defined(OS_CHROMEOS)
 #endif  // defined(GOOGLE_CHROME_BUILD)
   return enabled;
 }