Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/ui/search_engines/keyword_editor_controller.cc

 // 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.
 
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"

[Mattias Nissler (ping if slow), 2013/01/31 14:50:45]

required?

[Jói, 2013/01/31 16:23:37]

Done.

 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/user_metrics.h"
 
 using content::UserMetricsAction;
 
 KeywordEditorController::KeywordEditorController(Profile* profile)
     : profile_(profile) {
   table_model_.reset(new TemplateURLTableModel(
       TemplateURLServiceFactory::GetForProfile(profile)));
 }
 
 KeywordEditorController::~KeywordEditorController() {
 }
 
 // static
 // TODO(rsesek): Other platforms besides Mac should remember window
 // placement. http://crbug.com/22269
-void KeywordEditorController::RegisterPrefs(PrefServiceSimple* prefs) {
-  prefs->RegisterDictionaryPref(prefs::kKeywordEditorWindowPlacement);
+void KeywordEditorController::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterDictionaryPref(prefs::kKeywordEditorWindowPlacement);
 }
 
 int KeywordEditorController::AddTemplateURL(const string16& title,
                                             const string16& keyword,
                                             const std::string& url) {
   DCHECK(!url.empty());
 
   content::RecordAction(UserMetricsAction("KeywordEditor_AddKeyword"));
 
   // There's a bug (1090726) in TableView with groups enabled such that newly
@@ skipping 55 matching lines @@
   return url_model()->loaded();
 }
 
 TemplateURL* KeywordEditorController::GetTemplateURL(int index) {
   return table_model_->GetTemplateURL(index);
 }
 
 TemplateURLService* KeywordEditorController::url_model() const {
   return table_model_->template_url_service();
 }