Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/content_settings/content_settings_policy_provider.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/content_settings/content_settings_policy_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 404 matching lines @@
 
 void PolicyProvider::ShutdownOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   RemoveAllObservers();
   if (!prefs_)
     return;
   pref_change_registrar_.RemoveAll();
   prefs_ = NULL;
 }
 
-void PolicyProvider::Observe(int type,
-                             const content::NotificationSource& source,
-                             const content::NotificationDetails& details) {
+void PolicyProvider::OnPreferenceChanged(PrefServiceBase* service,
+                                         const std::string& name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK_EQ(chrome::NOTIFICATION_PREF_CHANGED, type);
-  DCHECK_EQ(content::Source<PrefService>(source).ptr(), prefs_);
+  DCHECK_EQ(prefs_, service);
 
-  const std::string& name = *content::Details<std::string>(details).ptr();
   if (name == prefs::kManagedDefaultCookiesSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES);
   } else if (name == prefs::kManagedDefaultImagesSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_IMAGES);
   } else if (name == prefs::kManagedDefaultJavaScriptSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
   } else if (name == prefs::kManagedDefaultPluginsSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
   } else if (name == prefs::kManagedDefaultPopupsSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_POPUPS);
@@ skipping 12 matching lines @@
              name == prefs::kManagedJavaScriptAllowedForUrls ||
              name == prefs::kManagedJavaScriptBlockedForUrls ||
              name == prefs::kManagedPluginsAllowedForUrls ||
              name == prefs::kManagedPluginsBlockedForUrls ||
              name == prefs::kManagedPopupsAllowedForUrls ||
              name == prefs::kManagedPopupsBlockedForUrls ||
              name == prefs::kManagedNotificationsAllowedForUrls ||
              name == prefs::kManagedNotificationsBlockedForUrls) {
     ReadManagedContentSettings(true);
     ReadManagedDefaultSettings();
-  } else {
-    NOTREACHED();
-    return;
   }
+
   NotifyObservers(ContentSettingsPattern(),
                   ContentSettingsPattern(),
                   CONTENT_SETTINGS_TYPE_DEFAULT,
                   std::string());
 }
 
 }  // namespace content_settings