Use PrefChangeRegistrar everywhere

chrome/browser/profile_impl.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/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 274 matching lines @@
       spellcheck_host_(NULL),
       spellcheck_host_ready_(false),
       shutdown_session_service_(false) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
   create_session_service_timer_.Start(
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
 
   PrefService* prefs = GetPrefs();
-  prefs->AddPrefObserver(prefs::kSpellCheckDictionary, this);
-  prefs->AddPrefObserver(prefs::kEnableSpellCheck, this);
-  prefs->AddPrefObserver(prefs::kEnableAutoSpellCorrect, this);
+  pref_change_registrar_.Init(prefs);
+  pref_change_registrar_.Add(prefs::kSpellCheckDictionary, this);
+  pref_change_registrar_.Add(prefs::kEnableSpellCheck, this);
+  pref_change_registrar_.Add(prefs::kEnableAutoSpellCorrect, this);
 
 #if defined(OS_MACOSX)
   // If the profile directory doesn't already have a cache directory and it
   // is under ~/Library/Application Support, use a suitable cache directory
   // under ~/Library/Caches.  For example, a profile directory of
   // ~/Library/Application Support/Google/Chrome/MyProfileName that doesn't
   // have a "Cache" or "MediaCache" subdirectory would use the cache directory
   // ~/Library/Caches/Google/Chrome/MyProfileName.
   //
   // TODO(akalin): Come up with unit tests for this.
@@ skipping 75 matching lines @@
   ExtensionErrorReporter::Init(true);  // allow noisy errors.
 
   FilePath script_dir;  // Don't look for user scripts in any directory.
                         // TODO(aa): We should just remove this functionality,
                         // since it isn't used anymore.
   user_script_master_ = new UserScriptMaster(script_dir, this);
 
   extensions_service_ = new ExtensionsService(
       this,
       CommandLine::ForCurrentProcess(),
-      GetPrefs(),
       GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName),
       true);
 
   // Register the component extensions.
   typedef std::list<std::pair<std::string, int> > ComponentExtensionList;
   ComponentExtensionList component_extensions;
 
   // Bookmark manager.
   component_extensions.push_back(
       std::make_pair("bookmark_manager", IDR_BOOKMARKS_MANIFEST));
@@ skipping 90 matching lines @@
   if (download_manager_.get()) {
     // The download manager queries the history system and should be shutdown
     // before the history is shutdown so it can properly cancel all requests.
     download_manager_->Shutdown();
     download_manager_ = NULL;
   }
 
   // The theme provider provides bitmaps to whoever wants them.
   theme_provider_.reset();
 
-  // Remove pref observers.
-  PrefService* prefs = GetPrefs();
-  prefs->RemovePrefObserver(prefs::kSpellCheckDictionary, this);
-  prefs->RemovePrefObserver(prefs::kEnableSpellCheck, this);
-  prefs->RemovePrefObserver(prefs::kEnableAutoSpellCorrect, this);
+  // Remove pref observers
+  pref_change_registrar_.RemoveAll();
 
   // Delete the NTP resource cache so we can unregister pref observers.
   ntp_resource_cache_.reset();
 
   // The sync service needs to be deleted before the services it calls.
   sync_service_.reset();
 
   // Both HistoryService and WebDataService maintain threads for background
   // processing. Its possible each thread still has tasks on it that have
   // increased the ref count of the service. In such a situation, when we
@@ skipping 797 matching lines @@
 #if defined(OS_CHROMEOS)
 chromeos::ProxyConfigServiceImpl*
     ProfileImpl::GetChromeOSProxyConfigServiceImpl() {
   if (!chromeos_proxy_config_service_impl_) {
     chromeos_proxy_config_service_impl_ =
         new chromeos::ProxyConfigServiceImpl();
   }
   return chromeos_proxy_config_service_impl_;
 }
 #endif  // defined(OS_CHROMEOS)