Remove PrefObserver usage, batch 9.

chrome/browser/safe_browsing/safe_browsing_service.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/safe_browsing/safe_browsing_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 1357 matching lines @@
       Profile* profile = content::Source<Profile>(source).ptr();
       if (!profile->IsOffTheRecord())
         RemovePrefService(profile->GetPrefs());
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
-void SafeBrowsingService::OnPreferenceChanged(PrefServiceBase* service,
-                                              const std::string& pref_name) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(pref_name == prefs::kSafeBrowsingEnabled);
-  RefreshState();
-}
-
 bool SafeBrowsingService::IsWhitelisted(const UnsafeResource& resource) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Check if the user has already ignored our warning for this render_view
   // and domain.
   for (size_t i = 0; i < white_listed_entries_.size(); ++i) {
     const WhiteListedEntry& entry = white_listed_entries_[i];
     if (entry.render_process_host_id == resource.render_process_host_id &&
         entry.render_view_id == resource.render_view_id &&
         // Threat type must be the same or in the case of phishing they can
         // either be client-side phishing URL or a SafeBrowsing phishing URL.
@@ skipping 10 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 void SafeBrowsingService::AddPrefService(PrefService* pref_service) {
   DCHECK(prefs_map_.find(pref_service) == prefs_map_.end());
   PrefChangeRegistrar* registrar = new PrefChangeRegistrar();
   registrar->Init(pref_service);
-  registrar->Add(prefs::kSafeBrowsingEnabled, this);
+  registrar->Add(prefs::kSafeBrowsingEnabled,
+                 base::Bind(&SafeBrowsingService::RefreshState,
+                            base::Unretained(this)));
   prefs_map_[pref_service] = registrar;
   RefreshState();
 }
 
 void SafeBrowsingService::RemovePrefService(PrefService* pref_service) {
   if (prefs_map_.find(pref_service) != prefs_map_.end()) {
     delete prefs_map_[pref_service];
     prefs_map_.erase(pref_service);
     RefreshState();
   } else {
@@ skipping 18 matching lines @@
     Stop();
 
   if (csd_service_.get())
     csd_service_->SetEnabledAndRefreshState(enable);
   if (download_service_.get()) {
     download_service_->SetEnabled(
         enable && !CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisableImprovedDownloadProtection));
   }
 }