Remove PrefServiceBase, since everyone can now depend directly on PrefService.

TBR=ben@chromium.org
BUG=155525


Review URL: https://chromiumcodereview.appspot.com/12252008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182918 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 11 deletions

diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
index d99b592..47684b3 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
@@ -6,7 +6,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
-#include "base/prefs/public/pref_service_base.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -249,12 +248,12 @@ void BookmarkContextMenuController::ExecuteCommand(int id) {
 
 bool BookmarkContextMenuController::IsCommandIdChecked(int command_id) const {
   DCHECK(command_id == IDC_BOOKMARK_BAR_ALWAYS_SHOW);
-  PrefServiceBase* prefs = PrefServiceBase::FromBrowserContext(profile_);
+  PrefService* prefs = PrefServiceFromBrowserContext(profile_);
   return prefs->GetBoolean(prefs::kShowBookmarkBar);
 }
 
 bool BookmarkContextMenuController::IsCommandIdEnabled(int command_id) const {
-  PrefServiceBase* prefs = PrefServiceBase::FromBrowserContext(profile_);
+  PrefService* prefs = PrefServiceFromBrowserContext(profile_);
 
   bool is_root_node = selection_.size() == 1 &&
                       selection_[0]->parent() == model_->root_node();
diff --git a/chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc b/chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc
index f6bd035a..c58e501 100644
--- a/chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc
@@ -202,7 +202,7 @@ void BookmarkPromptController::ClosingBookmarkPrompt() {
 
 // static
 void BookmarkPromptController::DisableBookmarkPrompt(
-    PrefServiceBase* prefs) {
+    PrefService* prefs) {
   UMA_HISTOGRAM_ENUMERATION("BookmarkPrompt.DisabledReason",
                             PROMPT_DISABLED_REASON_BY_MANUAL,
                             PROMPT_DISABLED_REASON_LIMIT);
diff --git a/chrome/browser/ui/bookmarks/bookmark_prompt_controller.h b/chrome/browser/ui/bookmarks/bookmark_prompt_controller.h
index 36995b9..d0ee151 100644
--- a/chrome/browser/ui/bookmarks/bookmark_prompt_controller.h
+++ b/chrome/browser/ui/bookmarks/bookmark_prompt_controller.h
@@ -16,7 +16,7 @@
 #include "googleurl/src/gurl.h"
 
 class Browser;
-class PrefServiceBase;
+class PrefService;
 
 namespace content {
 class WebContents;
@@ -54,7 +54,7 @@ class BookmarkPromptController : public chrome::BrowserListObserver,
   static void ClosingBookmarkPrompt();
 
   // Disable bookmark prompt feature in a profile in |prefs|.
-  static void DisableBookmarkPrompt(PrefServiceBase* prefs);
+  static void DisableBookmarkPrompt(PrefService* prefs);
 
   // True if bookmark prompt feature is enabled, otherwise false.
   static bool IsEnabled();
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc
index bbdd283..d09165c 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/prefs/public/pref_service_base.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -240,7 +240,7 @@ void GetURLAndTitleToBookmark(content::WebContents* web_contents,
 }
 
 void ToggleBookmarkBarWhenVisible(content::BrowserContext* browser_context) {
-  PrefServiceBase* prefs = PrefServiceBase::FromBrowserContext(browser_context);
+  PrefService* prefs = PrefServiceFromBrowserContext(browser_context);
   const bool always_show = !prefs->GetBoolean(prefs::kShowBookmarkBar);
 
   // The user changed when the bookmark bar is shown, update the preferences.
@@ -248,7 +248,7 @@ void ToggleBookmarkBarWhenVisible(content::BrowserContext* browser_context) {
 }
 
 string16 FormatBookmarkURLForDisplay(const GURL& url,
-                                     const PrefServiceBase* prefs) {
+                                     const PrefService* prefs) {
   std::string languages;
   if (prefs)
     languages = prefs->GetString(prefs::kAcceptLanguages);
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.h b/chrome/browser/ui/bookmarks/bookmark_utils.h
index 594eaef..23a8d32 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.h
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.h
@@ -14,7 +14,7 @@
 class BookmarkNode;
 class Browser;
 class GURL;
-class PrefServiceBase;
+class PrefService;
 
 namespace content {
 class BrowserContext;
@@ -78,7 +78,7 @@ void ToggleBookmarkBarWhenVisible(content::BrowserContext* browser_context);
 // the given |prefs|, which may be NULL.  When re-parsing this URL, clients
 // should call URLFixerUpper::FixupURL().
 string16 FormatBookmarkURLForDisplay(const GURL& url,
-                                     const PrefServiceBase* prefs);
+                                     const PrefService* prefs);
 
 }  // namespace chrome