Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/common/metrics/metrics_log_base.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/common/process_type.h"
 #include "ui/gfx/size.h"
 
 struct AutocompleteLog;
 class PrefService;
-class PrefServiceSimple;
+class PrefRegistrySimple;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace tracked_objects {
 struct ProcessDataSnapshot;
 }
 
 namespace chrome_variations {
@@ skipping 24 matching lines @@
 };
 
 class MetricsLog : public MetricsLogBase {
  public:
   // Creates a new metrics log
   // 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);
   virtual ~MetricsLog();
 
-  static void RegisterPrefs(PrefServiceSimple* prefs);
+  static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Get the amount of uptime in seconds since this function was last called.
   // This updates the cumulative uptime metric for uninstall as a side effect.
   static int64 GetIncrementalUptime(PrefService* pref);
 
   // 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.
@@ skipping 109 matching lines @@
   void WriteGoogleUpdateProto(const GoogleUpdateMetrics& google_update_metrics);
 
   // Registers as observer with net::NetworkChangeNotifier and keeps track of
   // the network environment.
   scoped_ptr<NetworkObserver> network_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsLog);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_LOG_H_