Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/ui/search_engines/keyword_editor_controller.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_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
 #define CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 
-class PrefServiceSimple;
+class PrefRegistrySimple;
 class Profile;
 class TemplateURL;
 class TemplateURLService;
 class TemplateURLTableModel;
 
 class KeywordEditorController {
  public:
   explicit KeywordEditorController(Profile* profile);
   ~KeywordEditorController();
 
-  static void RegisterPrefs(PrefServiceSimple* prefs);
+  static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Invoked when the user succesfully fills out the add keyword dialog.
   // Propagates the change to the TemplateURLService and updates the table
   // model.  Returns the index of the added URL.
   int AddTemplateURL(const string16& title,
                      const string16& keyword,
                      const std::string& url);
 
   // Invoked when the user modifies a TemplateURL. Updates the
   // TemplateURLService and table model appropriately.
@@ skipping 34 matching lines @@
   // The profile.
   Profile* profile_;
 
   // Model for the TableView.
   scoped_ptr<TemplateURLTableModel> table_model_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordEditorController);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_ENGINES_KEYWORD_EDITOR_CONTROLLER_H_