Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/managed_mode/managed_mode.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_MANAGED_MODE_MANAGED_MODE_H_
 #define CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Browser;
 template<typename T>
 struct DefaultSingletonTraits;
 class ManagedModeSiteList;
 class ManagedModeURLFilter;
 class PrefChangeRegistrar;
-class PrefServiceSimple;
+class PrefRegistrarSimple;
 class PrefServiceSyncable;
 class Profile;
 
 // Managed mode allows one person to manage the Chrome experience for another
 // person by pre-configuring and then locking a managed User profile.
 // The ManagedMode class provides methods to check whether the browser is in
 // managed mode, and to attempt to enter or leave managed mode.
 // Except where otherwise noted, this class should be used on the UI thread.
 class ManagedMode : public chrome::BrowserListObserver,
                     public extensions::ManagementPolicy::Provider,
                     public content::NotificationObserver {
  public:
   typedef base::Callback<void(bool)> EnterCallback;
 
-  static void RegisterPrefs(PrefServiceSimple* prefs);
+  static void RegisterPrefs(PrefRegistrarSimple* prefs);
   static void RegisterUserPrefs(PrefServiceSyncable* prefs);
 
   // Initializes the singleton, setting the managed_profile_. Must be called
   // after g_browser_process and the LocalState have been created.
   static void Init(Profile* profile);
   static bool IsInManagedMode();
 
   // Calls |callback| with the argument true iff managed mode was entered
   // sucessfully.
   static void EnterManagedMode(Profile* profile, const EnterCallback& callback);
@@ skipping 87 matching lines @@
   scoped_ptr<URLFilterContext> io_url_filter_context_;
   scoped_ptr<URLFilterContext> ui_url_filter_context_;
 
   std::set<Browser*> browsers_to_close_;
   std::vector<EnterCallback> callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedMode);
 };
 
 #endif  // CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_H_