Remove PrefObserver usages, batch 6.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 378 matching lines @@
 #if defined(ENABLE_THEMES)
   registrar_.Add(
       this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
       content::Source<ThemeService>(
           ThemeServiceFactory::GetForProfile(profile_)));
 #endif
   registrar_.Add(this, chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,
                  content::NotificationService::AllSources());
 
   profile_pref_registrar_.Init(profile_->GetPrefs());
-  profile_pref_registrar_.Add(prefs::kDevToolsDisabled, this);
-  profile_pref_registrar_.Add(prefs::kShowBookmarkBar, this);
-  profile_pref_registrar_.Add(prefs::kHomePage, this);
+  profile_pref_registrar_.Add(
+      prefs::kDevToolsDisabled,
+      base::Bind(&Browser::OnDevToolsDisabledChanged, base::Unretained(this)));
+  profile_pref_registrar_.Add(
+      prefs::kShowBookmarkBar,
+      base::Bind(&Browser::UpdateBookmarkBarState, base::Unretained(this),
+                 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE));
+  profile_pref_registrar_.Add(
+      prefs::kHomePage,
+      base::Bind(&Browser::MarkHomePageAsChanged, base::Unretained(this)));
 
   BrowserList::AddBrowser(this);
 
   // NOTE: These prefs all need to be explicitly destroyed in the destructor
   // or you'll get a nasty surprise when you run the incognito tests.
   encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector,
                              profile_->GetPrefs(), NULL);
 
   instant_controller_.reset(new chrome::BrowserInstantController(this));
 
@@ skipping 1523 matching lines @@
 
     case content::NOTIFICATION_INTERSTITIAL_DETACHED:
       UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
       break;
 
     default:
       NOTREACHED() << "Got a notification we didn't register for.";
   }
 }
 
-void Browser::OnPreferenceChanged(PrefServiceBase* service,
-                                  const std::string& pref_name) {
-  if (pref_name == prefs::kDevToolsDisabled) {
-    if (profile_->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled))
-      content::DevToolsManager::GetInstance()->CloseAllClientHosts();
-  } else if (pref_name == prefs::kShowBookmarkBar) {
-    UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE);
-  } else if (pref_name == prefs::kHomePage) {
-    MarkHomePageAsChanged(static_cast<PrefService*>(service));
-  } else {
-    NOTREACHED();
-  }
-}
-
 void Browser::ModeChanged(const chrome::search::Mode& old_mode,
                           const chrome::search::Mode& new_mode) {
   UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Command and state updating (private):
 
-void Browser::MarkHomePageAsChanged(PrefService* pref_service) {
-  pref_service->SetBoolean(prefs::kHomePageChanged, true);
+void Browser::OnDevToolsDisabledChanged() {
+  if (profile_->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled))
+    content::DevToolsManager::GetInstance()->CloseAllClientHosts();
+}
+
+void Browser::MarkHomePageAsChanged() {
+  profile_->GetPrefs()->SetBoolean(prefs::kHomePageChanged, true);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, UI update coalescing and handling (private):
 
 void Browser::UpdateToolbar(bool should_restore_state) {
   window_->UpdateToolbar(chrome::GetActiveTabContents(this),
                          should_restore_state);
 }
 
@@ skipping 373 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }