Remove PrefObserver usages, batch 6.

chrome/browser/ui/webui/options/preferences_browsertest.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/ui/webui/options/preferences_browsertest.h"
 
 #include <iostream>
 #include <sstream>
 
 #include "base/json/json_reader.h"
@@ skipping 144 matching lines @@
       L""
       L"  finishObservingAndReply: function() {"
       L"    this.sentinelValue_ = !this.sentinelValue_;"
       L"    Preferences.setBooleanPref(this.sentinelName_, this.sentinelValue_,"
       L"                               true);"
       L"  }"
       L"};"));
 }
 
 // Forwards notifications received when pref values change in the backend.
-void PreferencesBrowserTest::OnPreferenceChanged(PrefServiceBase* service,
-                                                 const std::string& pref_name) {
-  ASSERT_EQ(pref_service_, service);
+void PreferencesBrowserTest::OnPreferenceChanged(const std::string& pref_name) {
   OnCommit(pref_service_->FindPreference(pref_name.c_str()));
 }
 
 // Sets up a mock user policy provider.
 void PreferencesBrowserTest::SetUpInProcessBrowserTestFixture() {
   EXPECT_CALL(policy_provider_, IsInitializationComplete())
       .WillRepeatedly(Return(true));
   policy::BrowserPolicyConnector::SetPolicyProviderForTesting(
       &policy_provider_);
 };
@@ skipping 84 matching lines @@
   scoped_ptr<base::Value> observed_value_ptr(base::JSONReader::Read(json));
   const base::DictionaryValue* observed_dict;
   ASSERT_TRUE(observed_value_ptr.get());
   ASSERT_TRUE(observed_value_ptr->GetAsDictionary(&observed_dict));
   for (size_t i = 0; i < names.size(); ++i)
     VerifyPref(observed_dict, names[i], values[i], controlledBy, disabled,
                uncommitted);
 }
 
 void PreferencesBrowserTest::ExpectNoCommit(const std::string& name) {
-  pref_change_registrar_.Add(name.c_str(), this);
+  pref_change_registrar_.Add(
+      name.c_str(),
+      base::Bind(&PreferencesBrowserTest::OnPreferenceChanged,
+                 base::Unretained(this)));
   EXPECT_CALL(*this, OnCommit(Property(&PrefService::Preference::name, name)))
       .Times(0);
 }
 
 void PreferencesBrowserTest::ExpectSetCommit(const std::string& name,
                                              const base::Value* value) {
-  pref_change_registrar_.Add(name.c_str(), this);
+  pref_change_registrar_.Add(
+      name.c_str(),
+      base::Bind(&PreferencesBrowserTest::OnPreferenceChanged,
+                 base::Unretained(this)));
   EXPECT_CALL(*this, OnCommit(AllOf(
       Property(&PrefService::Preference::name, name),
       Property(&PrefService::Preference::IsUserControlled, true),
       Property(&PrefService::Preference::GetValue, EqualsValue(value)))));
 }
 
 void PreferencesBrowserTest::ExpectClearCommit(const std::string& name) {
-  pref_change_registrar_.Add(name.c_str(), this);
+  pref_change_registrar_.Add(
+      name.c_str(),
+      base::Bind(&PreferencesBrowserTest::OnPreferenceChanged,
+                 base::Unretained(this)));
   EXPECT_CALL(*this, OnCommit(AllOf(
       Property(&PrefService::Preference::name, name),
       Property(&PrefService::Preference::IsUserControlled, false))));
 }
 
 void PreferencesBrowserTest::VerifyAndClearExpectations() {
   Mock::VerifyAndClearExpectations(this);
   pref_change_registrar_.RemoveAll();
 }
 
@@ skipping 430 matching lines @@
   // Do not set the Boolean pref. It will toogle automatically.
   for (size_t i = 1; i < pref_names_.size(); ++i)
     chromeos::proxy_cros_settings_parser::SetProxyPrefValue(
         profile, pref_names_[i], non_default_values_[i]->DeepCopy());
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
                       "", false, false);
 }
 
 #endif