Use PrefChangeRegistrar everywhere

chrome/browser/host_content_settings_map.cc

 // Copyright (c) 2010 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/host_content_settings_map.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 212 matching lines @@
   }
   if (prefs->GetInteger(prefs::kContentSettingsVersion) >
       kContentSettingsPatternVersion) {
     LOG(ERROR) << "Unknown content settings version in preferences.";
     return;
   }
 
   // Read exceptions.
   ReadExceptions(false);
 
-  prefs->AddPrefObserver(prefs::kDefaultContentSettings, this);
-  prefs->AddPrefObserver(prefs::kContentSettingsPatterns, this);
-  prefs->AddPrefObserver(prefs::kBlockThirdPartyCookies, this);
-  prefs->AddPrefObserver(prefs::kBlockNonsandboxedPlugins, this);
+  pref_change_registrar_.Init(prefs);
+  pref_change_registrar_.Add(prefs::kDefaultContentSettings, this);
+  pref_change_registrar_.Add(prefs::kContentSettingsPatterns, this);
+  pref_change_registrar_.Add(prefs::kBlockThirdPartyCookies, this);
+  pref_change_registrar_.Add(prefs::kBlockNonsandboxedPlugins, this);
   notification_registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
                               Source<Profile>(profile_));
 }
 
 // static
 void HostContentSettingsMap::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings);
   prefs->RegisterIntegerPref(prefs::kContentSettingsVersion,
                              kContentSettingsPatternVersion);
   prefs->RegisterDictionaryPref(prefs::kContentSettingsPatterns);
@@ skipping 655 matching lines @@
   NotificationService::current()->Notify(
       NotificationType::CONTENT_SETTINGS_CHANGED,
       Source<HostContentSettingsMap>(this),
       Details<const ContentSettingsDetails>(&details));
 }
 
 void HostContentSettingsMap::UnregisterObservers() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   if (!profile_)
     return;
-  PrefService* prefs = profile_->GetPrefs();
-  prefs->RemovePrefObserver(prefs::kDefaultContentSettings, this);
-  prefs->RemovePrefObserver(prefs::kContentSettingsPatterns, this);
-  prefs->RemovePrefObserver(prefs::kBlockThirdPartyCookies, this);
-  prefs->RemovePrefObserver(prefs::kBlockNonsandboxedPlugins, this);
+  pref_change_registrar_.RemoveAll();
   notification_registrar_.Remove(this, NotificationType::PROFILE_DESTROYED,
                                  Source<Profile>(profile_));
   profile_ = NULL;
 }