Use PrefChangeRegistrar everywhere

chrome/browser/extensions/extensions_service.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/extensions/extensions_service.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 510 matching lines @@
 }
 
 bool ExtensionsService::IsDownloadFromMiniGallery(const GURL& download_url) {
   return StartsWithASCII(download_url.spec(),
                          extension_urls::kMiniGalleryDownloadPrefix,
                          false);  // case_sensitive
 }
 
 ExtensionsService::ExtensionsService(Profile* profile,
                                      const CommandLine* command_line,
-                                     PrefService* prefs,
                                      const FilePath& install_directory,
                                      bool autoupdate_enabled)
     : profile_(profile),
-      extension_prefs_(new ExtensionPrefs(prefs, install_directory)),
+      extension_prefs_(new ExtensionPrefs(profile->GetPrefs(),
+                                          install_directory)),
       install_directory_(install_directory),
       extensions_enabled_(true),
       show_extensions_prompts_(true),
       ready_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(toolbar_model_(this)) {
   // Figure out if extension installation should be enabled.
   if (command_line->HasSwitch(switches::kDisableExtensions)) {
     extensions_enabled_ = false;
   } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) {
     extensions_enabled_ = false;
   }
 
   registrar_.Add(this, NotificationType::EXTENSION_PROCESS_TERMINATED,
                  NotificationService::AllSources());
-  prefs->AddPrefObserver(prefs::kExtensionInstallAllowList, this);
-  prefs->AddPrefObserver(prefs::kExtensionInstallDenyList, this);
+  pref_change_registrar_.Init(profile->GetPrefs());
+  pref_change_registrar_.Add(prefs::kExtensionInstallAllowList, this);
+  pref_change_registrar_.Add(prefs::kExtensionInstallDenyList, this);
 
   // Set up the ExtensionUpdater
   if (autoupdate_enabled) {
     int update_frequency = kDefaultUpdateFrequencySeconds;
     if (command_line->HasSwitch(switches::kExtensionsUpdateFrequency)) {
       base::StringToInt(command_line->GetSwitchValueASCII(
           switches::kExtensionsUpdateFrequency),
           &update_frequency);
     }
-    updater_ = new ExtensionUpdater(this, prefs, update_frequency);
+    updater_ = new ExtensionUpdater(this,
+                                    profile->GetPrefs(),
+                                    update_frequency);
   }
 
   backend_ = new ExtensionsServiceBackend(install_directory_,
                                           extensions_enabled_);
 
   // Use monochrome icons for Omnibox icons.
   omnibox_popup_icon_manager_.set_monochrome(true);
   omnibox_icon_manager_.set_monochrome(true);
   omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft,
                                                 0, kOmniboxIconPaddingRight));
 }
 
 ExtensionsService::~ExtensionsService() {
+  DCHECK(!profile_);  // Profile should have told us it's going away.
   UnloadAllExtensions();
   if (updater_.get()) {
     updater_->Stop();
   }
 }
 
 void ExtensionsService::InitEventRouters() {
   ExtensionHistoryEventRouter::GetInstance()->ObserveProfile(profile_);
   ExtensionAccessibilityEventRouter::GetInstance()->ObserveProfile(profile_);
   ExtensionBrowserEventRouter::GetInstance()->Init(profile_);
@@ skipping 594 matching lines @@
   }
 
   // UnloadExtension will change the extensions_ list. So, we should
   // call it outside the iterator loop.
   for (unsigned int i = 0; i < to_be_removed.size(); ++i) {
     UnloadExtension(to_be_removed[i]);
   }
 }
 
 void ExtensionsService::DestroyingProfile() {
-  profile_->GetPrefs()->RemovePrefObserver(
-      prefs::kExtensionInstallAllowList, this);
-  profile_->GetPrefs()->RemovePrefObserver(
-      prefs::kExtensionInstallDenyList, this);
-
+  pref_change_registrar_.RemoveAll();
   profile_ = NULL;
+  toolbar_model_.DestroyingProfile();
 }
 
 void ExtensionsService::CheckAdminBlacklist() {
   std::vector<std::string> to_be_removed;
   // Loop through extensions list, unload installed extensions.
   for (ExtensionList::const_iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
     Extension* extension = (*iter);
     if (!extension_prefs_->IsExtensionAllowedByPolicy(extension->id()))
       to_be_removed.push_back(extension->id());
@@ skipping 588 matching lines @@
     return false;
 
   for (ExtensionList::const_iterator it = extensions_.begin();
        it != extensions_.end(); ++it) {
     if ((*it)->is_app())
       return true;
   }
 
   return false;
 }