Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/plugins/plugin_prefs.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/plugins/plugin_prefs.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 256 matching lines @@
   // Check user preferences for the plug-in group.
   std::map<string16, bool>::const_iterator group_it(
       plugin_group_state_.find(plugin.name));
   if (group_it != plugin_group_state_.end())
     return group_it->second;
 
   // Default to enabled.
   return true;
 }
 
-void PluginPrefs::Observe(int type,
-                          const content::NotificationSource& source,
-                          const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_PREF_CHANGED, type);
-  const std::string* pref_name = content::Details<std::string>(details).ptr();
-  if (!pref_name) {
-    NOTREACHED();
-    return;
-  }
-  DCHECK_EQ(prefs_, content::Source<PrefService>(source).ptr());
-  if (*pref_name == prefs::kPluginsDisabledPlugins) {
+void PluginPrefs::OnPreferenceChanged(PrefServiceBase* service,
+                                      const std::string& pref_name) {
+  DCHECK_EQ(prefs_, service);
+  if (pref_name == prefs::kPluginsDisabledPlugins) {
     base::AutoLock auto_lock(lock_);
     ListValueToStringSet(prefs_->GetList(prefs::kPluginsDisabledPlugins),
                          &policy_disabled_plugin_patterns_);
-  } else if (*pref_name == prefs::kPluginsDisabledPluginsExceptions) {
+  } else if (pref_name == prefs::kPluginsDisabledPluginsExceptions) {
     base::AutoLock auto_lock(lock_);
     ListValueToStringSet(
         prefs_->GetList(prefs::kPluginsDisabledPluginsExceptions),
         &policy_disabled_plugin_exception_patterns_);
-  } else if (*pref_name == prefs::kPluginsEnabledPlugins) {
+  } else if (pref_name == prefs::kPluginsEnabledPlugins) {
     base::AutoLock auto_lock(lock_);
     ListValueToStringSet(prefs_->GetList(prefs::kPluginsEnabledPlugins),
                          &policy_enabled_plugin_patterns_);
   } else {
     NOTREACHED();
   }
   NotifyPluginStatusChanged();
 }
 
 /*static*/
@@ skipping 330 matching lines @@
   }
 }
 
 void PluginPrefs::NotifyPluginStatusChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }