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/extensions_metrics_provider.h"
@@ skipping 17 matching lines @@
 }
 
 MetricsService* MetricsServicesManager::GetMetricsService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!metrics_service_client_) {
     metrics_service_client_ =
         ChromeMetricsServiceClient::Create(GetMetricsStateManager(),
                                            local_state_);
     metrics_service_client_->metrics_service()->RegisterMetricsProvider(
         scoped_ptr<metrics::MetricsProvider>(
             new ExtensionsMetricsProvider(GetMetricsStateManager())));

[blundell, 2014/06/02 14:24:46]

this is already done in ChromeMetricsServiceClient o_o

   }
   return metrics_service_client_->metrics_service();
 }
 
 rappor::RapporService* MetricsServicesManager::GetRapporService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!rappor_service_)
     rappor_service_.reset(new rappor::RapporService);
   return rappor_service_.get();
 }
 
 chrome_variations::VariationsService*
 MetricsServicesManager::GetVariationsService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!variations_service_) {
     variations_service_ =
         chrome_variations::VariationsService::Create(local_state_,
                                                      GetMetricsStateManager());
   }
   return variations_service_.get();
 }
 
 void MetricsServicesManager::OnPluginLoadingError(
     const base::FilePath& plugin_path) {
-  GetMetricsService()->LogPluginLoadingError(plugin_path);
+  if (!metrics_service_client_)
+    GetMetricsService();

[Alexei Svitkine (slow), 2014/06/02 13:54:03]

Nit: Instead, create a private GetMetricsServiceClient() method and make
GetMetricsService() simply call GetMetricsServiceClient()->metrics_service().

[blundell, 2014/06/02 14:24:46]

Done.

+  metrics_service_client_->LogPluginLoadingError(plugin_path);
 }
 
 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!metrics_state_manager_) {
     metrics_state_manager_ = metrics::MetricsStateManager::Create(
         local_state_,
         base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled,
                    base::Unretained(this)));
   }
@@ skipping 13 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;
 }