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

chrome/browser/metrics/metrics_log.h

 // Copyright (c) 2012 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.
 
 // This file defines a set of user experience metrics data recorded by
 // the MetricsService.  This is the unit of data that is sent to the server.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_LOG_H_
 #define CHROME_BROWSER_METRICS_METRICS_LOG_H_
 
@@ skipping 51 matching lines @@
     GoogleUpdateSettings::ProductData google_update_data;
     // Details about Google Update's attempts to update this product.
     GoogleUpdateSettings::ProductData product_data;
 };
 
 class MetricsLog : public metrics::MetricsLogBase {
  public:
   // Creates a new metrics log of the specified type.
   // client_id is the identifier for this profile on this installation
   // session_id is an integer that's incremented on each application launch
-  MetricsLog(const std::string& client_id, int session_id, LogType log_type);
+  // |local_state| is the PrefService that this instance should use.
+  MetricsLog(const std::string& client_id,
+             int session_id,
+             LogType log_type,
+             PrefService* local_state);
   virtual ~MetricsLog();
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Get the current version of the application as a string.
   static std::string GetVersionString();
 
   // Use |extension| in all uploaded appversions in addition to the standard
   // version string.
   static void set_version_extension(const std::string& extension);
@@ skipping 36 matching lines @@
   void RecordStabilityMetrics(base::TimeDelta incremental_uptime,
                               base::TimeDelta uptime);
 
   const base::TimeTicks& creation_time() const {
     return creation_time_;
   }
 
  protected:
   // Exposed for the sake of mocking in test code.
 
-  // Returns the PrefService from which to log metrics data.
-  virtual PrefService* GetPrefService();
-
   // Returns the screen size for the primary monitor.
   virtual gfx::Size GetScreenSize() const;
 
   // Returns the device scale factor for the primary monitor.
   virtual float GetScreenDeviceScaleFactor() const;
 
   // Returns the number of monitors the user is using.
   virtual int GetScreenCount() const;
 
   // Fills |field_trial_ids| with the list of initialized field trials name and
@@ skipping 40 matching lines @@
 
   // Observes network state to provide values for SystemProfile::Network.
   MetricsNetworkObserver network_observer_;
 
   // The time when the current log was created.
   const base::TimeTicks creation_time_;
 
   // For including information on which extensions are installed in reports.
   HashedExtensionMetrics extension_metrics_;
 
+  PrefService* local_state_;
+
   DISALLOW_COPY_AND_ASSIGN(MetricsLog);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_LOG_H_