Use PrefChangeRegistrar everywhere

chrome/browser/net/chrome_url_request_context.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/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
@@ skipping 508 matching lines @@
 
 }  // namespace
 
 // ----------------------------------------------------------------------------
 // ChromeURLRequestContextGetter
 // ----------------------------------------------------------------------------
 
 ChromeURLRequestContextGetter::ChromeURLRequestContextGetter(
     Profile* profile,
     ChromeURLRequestContextFactory* factory)
-  : prefs_(NULL),
-    factory_(factory),
+  : factory_(factory),
     url_request_context_(NULL) {
   DCHECK(factory);
 
   // If a base profile was specified, listen for changes to the preferences.
   if (profile)
     RegisterPrefsObserver(profile);
 }
 
 ChromeURLRequestContextGetter::~ChromeURLRequestContextGetter() {
   CheckCurrentlyOnIOThread();
 
-  DCHECK(!prefs_) << "Probably didn't call CleanupOnUIThread";
+  DCHECK(registrar_.IsEmpty()) << "Probably didn't call CleanupOnUIThread";
 
   // Either we already transformed the factory into a URLRequestContext, or
   // we still have a pending factory.
   DCHECK((factory_.get() && !url_request_context_.get()) ||
          (!factory_.get() && url_request_context_.get()));
 
   // The scoped_refptr / scoped_ptr destructors take care of releasing
   // |factory_| and |url_request_context_| now.
 }
 
@@ skipping 92 matching lines @@
 ChromeURLRequestContextGetter*
 ChromeURLRequestContextGetter::CreateOffTheRecordForExtensions(
     Profile* profile) {
   DCHECK(profile->IsOffTheRecord());
   return new ChromeURLRequestContextGetter(
       profile, new FactoryForExtensions(profile, FilePath(), true));
 }
 
 void ChromeURLRequestContextGetter::CleanupOnUIThread() {
   CheckCurrentlyOnMainThread();
-
-  if (prefs_) {
-    // Unregister for pref notifications.
-    prefs_->RemovePrefObserver(prefs::kAcceptLanguages, this);
-    prefs_->RemovePrefObserver(prefs::kDefaultCharset, this);
-    prefs_ = NULL;
-  }
+  // Unregister for pref notifications.
+  registrar_.RemoveAll();
 }
 
 void ChromeURLRequestContextGetter::OnNewExtensions(
     const std::string& id,
     ChromeURLRequestContext::ExtensionInfo* info) {
   GetIOContext()->OnNewExtensions(id, info);
 }
 
 void ChromeURLRequestContextGetter::OnUnloadedExtension(
     const std::string& id) {
@@ skipping 31 matching lines @@
               default_charset));
     }
   } else {
     NOTREACHED();
   }
 }
 
 void ChromeURLRequestContextGetter::RegisterPrefsObserver(Profile* profile) {
   CheckCurrentlyOnMainThread();
 
-  prefs_ = profile->GetPrefs();
-
-  prefs_->AddPrefObserver(prefs::kAcceptLanguages, this);
-  prefs_->AddPrefObserver(prefs::kDefaultCharset, this);
+  registrar_.Init(profile->GetPrefs());
+  registrar_.Add(prefs::kAcceptLanguages, this);
+  registrar_.Add(prefs::kDefaultCharset, this);
 }
 
 // static
 ChromeURLRequestContextGetter*
 ChromeURLRequestContextGetter::CreateRequestContextForMedia(
     Profile* profile, const FilePath& disk_cache_path, int cache_size,
     bool off_the_record) {
   return new ChromeURLRequestContextGetter(
       profile,
       new FactoryForMedia(profile,
@@ skipping 375 matching lines @@
       prefs::kProxyAutoDetect));
 
   if (pref_service->HasPrefPath(prefs::kProxyBypassList)) {
     std::string proxy_bypass =
         pref_service->GetString(prefs::kProxyBypassList);
     proxy_config->proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
   }
 
   return proxy_config;
 }