Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/policy/browser_policy_connector.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.
 
 #ifndef CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/policy/cloud_policy_constants.h"
 #include "chrome/browser/policy/configuration_policy_handler_list.h"
 #include "chrome/browser/policy/proxy_policy_provider.h"
 
-class PrefServiceSimple;
+class PrefRegistrySimple;
 class Profile;
 
 namespace policy {
 
 class ConfigurationPolicyProvider;
 class DeviceManagementService;
 class PolicyService;
 class PolicyStatisticsCollector;
 
 #if defined(OS_CHROMEOS)
@@ skipping 113 matching lines @@
   // Gets the URL of the DM server (either the default or a URL provided via the
   // command line).
   static std::string GetDeviceManagementUrl();
 
   // Check whether a user is known to be non-enterprise. Domains such as
   // gmail.com and googlemail.com are known to not be managed. Also returns
   // false if the username is empty.
   static bool IsNonEnterpriseUser(const std::string& username);
 
   // Registers refresh rate prefs.
-  static void RegisterPrefs(PrefServiceSimple* local_state);
+  static void RegisterPrefs(PrefRegistrySimple* local_state);
 
  private:
   // Complete initialization once the message loops are running and the
   // local_state is initialized.
   void CompleteInitialization();
 
   // Set the timezone as soon as the policies are available.
   void SetTimezoneIfPolicyAvailable();
 
   // Creates a new PolicyService with the shared policy providers and the given
@@ skipping 50 matching lines @@
   scoped_ptr<AppPackUpdater> app_pack_updater_;
   scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_