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

chrome/browser/metrics/metrics_service.h

Index: chrome/browser/metrics/metrics_service.h
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 3272264f9ce4d6281ac8990703c970cead4a8e0f..9af1b4bb817a68c5508cd2b3ebe10bce82fe02fe 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -44,6 +44,7 @@ namespace base {
 class DictionaryValue;
 class HistogramSamples;
 class MessageLoopProxy;
+class PrefService;
 }
 
 namespace variations {
@@ -103,12 +104,13 @@ class MetricsService
     SHUTDOWN_COMPLETE = 700,
   };
 
-  // Creates the MetricsService with the given |state_manager| and |client|.
-  // Does not take ownership of |state_manager| or |client|; instead stores a
-  // weak pointer to each. Caller should ensure that |state_manager| and
-  // |client| are valid for the lifetime of this class.
+  // Creates the MetricsService with the given |state_manager|, |client|, and
+  // |local_state|.  Does not take ownership of the paramaters; instead stores
+  // a weak pointer to each. Caller should ensure that the parameters are valid
+  // for the lifetime of this class.
   MetricsService(metrics::MetricsStateManager* state_manager,
-                 metrics::MetricsServiceClient* client);
+                 metrics::MetricsServiceClient* client,
+                 PrefService* local_state);
   virtual ~MetricsService();
 
   // Initializes metrics recording state. Updates various bookkeeping values in
@@ -188,10 +190,11 @@ class MetricsService
   void OnAppEnterForeground();
 #else
   // Set the dirty flag, which will require a later call to LogCleanShutdown().
-  static void LogNeedForCleanShutdown();
+  static void LogNeedForCleanShutdown(PrefService* local_state);
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 
-  static void SetExecutionPhase(ExecutionPhase execution_phase);
+  static void SetExecutionPhase(ExecutionPhase execution_phase,
+                                PrefService* local_state);
 
   // Saves in the preferences if the crash report registration was successful.
   // This count is eventually send via UMA logs.
@@ -419,6 +422,8 @@ class MetricsService
   // Registered metrics providers.
   ScopedVector<metrics::MetricsProvider> metrics_providers_;
 
+  PrefService* local_state_;
+
   base::ActionCallback action_callback_;
 
   // Indicate whether recording and reporting are currently happening.