Remove dependencies of Metrics{Service,Log} on g_browser_process->local_state()

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/extensions_metrics_provider.h"
 #include "chrome/browser/metrics/metrics_service.h"
@@ skipping 11 matching lines @@
     : local_state_(local_state) {
   DCHECK(local_state);
 }
 
 MetricsServicesManager::~MetricsServicesManager() {
 }
 
 MetricsService* MetricsServicesManager::GetMetricsService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!metrics_service_) {
-    metrics_service_.reset(
-        new MetricsService(GetMetricsStateManager(), &metrics_service_client_));
+    metrics_service_.reset(new MetricsService(
+        GetMetricsStateManager(), &metrics_service_client_, local_state_));
     metrics_service_client_.set_service(metrics_service_.get());
     metrics_service_->RegisterMetricsProvider(
         scoped_ptr<metrics::MetricsProvider>(
             new ExtensionsMetricsProvider(GetMetricsStateManager())));
   }
   return metrics_service_.get();
 }
 
 rappor::RapporService* MetricsServicesManager::GetRapporService() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 37 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;
 }