Remove PrefObserver usages, batch 13.

chrome/browser/ui/webui/options/content_settings_handler.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/webui/options/content_settings_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 470 matching lines @@
   notification_registrar_.Add(
       this, chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED,
       content::NotificationService::AllSources());
   Profile* profile = Profile::FromWebUI(web_ui());
   notification_registrar_.Add(
       this, chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED,
       content::Source<Profile>(profile));
 
   PrefService* prefs = profile->GetPrefs();
   pref_change_registrar_.Init(prefs);
-  pref_change_registrar_.Add(prefs::kGeolocationContentSettings, this);
-  pref_change_registrar_.Add(prefs::kPepperFlashSettingsEnabled, this);
+  pref_change_registrar_.Add(
+      prefs::kGeolocationContentSettings,
+      base::Bind(&ContentSettingsHandler::UpdateGeolocationExceptionsView,
+                 base::Unretained(this)));
+  pref_change_registrar_.Add(
+      prefs::kPepperFlashSettingsEnabled,
+      base::Bind(&ContentSettingsHandler::RefreshFlashSettingsCache,
+                 base::Unretained(this),
+                 false));
 
   flash_settings_manager_.reset(new PepperFlashSettingsManager(this, profile));
 }
 
 void ContentSettingsHandler::InitializePage() {
   UpdateHandlersEnabledRadios();
   UpdateAllExceptionsViewsFromModel();
 
   flash_cameramic_settings_ = CachedPepperFlashSettings();
   RefreshFlashSettingsCache(true);
@@ skipping 47 matching lines @@
     case chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED: {
       UpdateHandlersEnabledRadios();
       break;
     }
 
     default:
       OptionsPageUIHandler::Observe(type, source, details);
   }
 }
 
-void ContentSettingsHandler::OnPreferenceChanged(PrefServiceBase* service,
-                                                 const std::string& pref_name) {
-  if (pref_name == prefs::kGeolocationContentSettings)
-    UpdateGeolocationExceptionsView();
-  else if (pref_name == prefs::kPepperFlashSettingsEnabled)
-    RefreshFlashSettingsCache(false);
-}
-
 void ContentSettingsHandler::OnGetPermissionSettingsCompleted(
     uint32 request_id,
     bool success,
     PP_Flash_BrowserOperations_Permission default_permission,
     const ppapi::FlashSiteSettings& sites) {
   if (success &&
       request_id == flash_cameramic_settings_.last_refresh_request_id) {
     flash_cameramic_settings_.default_permission = default_permission;
     flash_cameramic_settings_.sites.clear();
     for (ppapi::FlashSiteSettings::const_iterator iter = sites.begin();
@@ skipping 739 matching lines @@
   for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
     if (type == kExContentSettingsTypeGroupNames[i].type)
       return kExContentSettingsTypeGroupNames[i].name;
   }
 
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace options