Remove PrefObserver usage, batch 9.

chrome/browser/net/ssl_config_service_manager_pref.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/net/ssl_config_service_manager.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/prefs/public/pref_change_registrar.h"
-#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_config_service.h"
 
@@ skipping 112 matching lines @@
   net::SSLConfig orig_config = cached_config_;
   cached_config_ = new_config;
   ProcessConfigUpdate(orig_config, new_config);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //  SSLConfigServiceManagerPref
 
 // The manager for holding and updating an SSLConfigServicePref instance.
 class SSLConfigServiceManagerPref
-    : public SSLConfigServiceManager,
-      public PrefObserver {
+    : public SSLConfigServiceManager {
  public:
   SSLConfigServiceManagerPref(PrefService* local_state,
                               PrefService* user_prefs);
   virtual ~SSLConfigServiceManagerPref() {}
 
   // Register local_state SSL preferences.
   static void RegisterPrefs(PrefService* local_state);
 
   virtual net::SSLConfigService* Get();
 
  private:
   // Callback for preference changes.  This will post the changes to the IO
   // thread with SetNewSSLConfig.
-  virtual void OnPreferenceChanged(PrefServiceBase* service,
-                                   const std::string& pref_name) OVERRIDE;
+  void OnPreferenceChanged(PrefServiceBase* prefs,
+                           const std::string& pref_name);
 
   // Store SSL config settings in |config|, directly from the preferences. Must
   // only be called from UI thread.
   void GetSSLConfigFromPrefs(net::SSLConfig* config);
 
   // Processes changes to the disabled cipher suites preference, updating the
   // cached list of parsed SSL/TLS cipher suites that are disabled.
   void OnDisabledCipherSuitesChange(PrefServiceBase* local_state);
 
   // Processes changes to the default cookie settings.
@@ skipping 25 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceManagerPref);
 };
 
 SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
     PrefService* local_state, PrefService* user_prefs)
     : have_user_prefs_(!!user_prefs),
       ssl_config_service_(new SSLConfigServicePref()) {
   DCHECK(local_state);
 
-  rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled,
-                             local_state, this);
-  ssl_version_min_.Init(prefs::kSSLVersionMin, local_state, this);
-  ssl_version_max_.Init(prefs::kSSLVersionMax, local_state, this);
-  channel_id_enabled_.Init(prefs::kEnableOriginBoundCerts, local_state, this);
-  ssl_record_splitting_disabled_.Init(prefs::kDisableSSLRecordSplitting,
-                                      local_state, this);
+  PrefChangeRegistrar::NamedChangeCallback local_state_callback = base::Bind(
+      &SSLConfigServiceManagerPref::OnPreferenceChanged,
+      base::Unretained(this),
+      local_state);
+
+  rev_checking_enabled_.Init(
+      prefs::kCertRevocationCheckingEnabled, local_state, local_state_callback);
+  ssl_version_min_.Init(
+      prefs::kSSLVersionMin, local_state, local_state_callback);
+  ssl_version_max_.Init(
+      prefs::kSSLVersionMax, local_state, local_state_callback);
+  channel_id_enabled_.Init(
+      prefs::kEnableOriginBoundCerts, local_state, local_state_callback);
+  ssl_record_splitting_disabled_.Init(
+      prefs::kDisableSSLRecordSplitting, local_state, local_state_callback);
+
   local_state_change_registrar_.Init(local_state);
-  local_state_change_registrar_.Add(prefs::kCipherSuiteBlacklist, this);
+  local_state_change_registrar_.Add(
+      prefs::kCipherSuiteBlacklist, local_state_callback);
 
   OnDisabledCipherSuitesChange(local_state);
 
   if (user_prefs) {
-    block_third_party_cookies_.Init(prefs::kBlockThirdPartyCookies, user_prefs,
-                                    this);
+    PrefChangeRegistrar::NamedChangeCallback user_prefs_callback = base::Bind(
+        &SSLConfigServiceManagerPref::OnPreferenceChanged,
+        base::Unretained(this),
+        user_prefs);
+    block_third_party_cookies_.Init(
+        prefs::kBlockThirdPartyCookies, user_prefs, user_prefs_callback);
     user_prefs_change_registrar_.Init(user_prefs);
-    user_prefs_change_registrar_.Add(prefs::kDefaultContentSettings, this);
+    user_prefs_change_registrar_.Add(
+        prefs::kDefaultContentSettings, user_prefs_callback);
 
     OnDefaultContentSettingsChange(user_prefs);
   }
 
   // Initialize from UI thread.  This is okay as there shouldn't be anything on
   // the IO thread trying to access it yet.
   GetSSLConfigFromPrefs(&ssl_config_service_->cached_config_);
 }
 
 // static
@@ skipping 100 matching lines @@
 // static
 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
     PrefService* local_state, PrefService* user_prefs) {
   return new SSLConfigServiceManagerPref(local_state, user_prefs);
 }
 
 // static
 void SSLConfigServiceManager::RegisterPrefs(PrefService* prefs) {
   SSLConfigServiceManagerPref::RegisterPrefs(prefs);
 }