Remove PrefObserver usages, batch 13.

chrome/browser/ui/webui/options/password_manager_handler.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/password_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 56 matching lines @@
 
 void PasswordManagerHandler::InitializeHandler() {
   // Due to the way that handlers are (re)initialized under certain types of
   // navigation, we may already be initialized. (See bugs 88986 and 86448.)
   // If this is the case, return immediately. This is a hack.
   // TODO(mdm): remove this hack once it is no longer necessary.
   if (!show_passwords_.GetPrefName().empty())
     return;
 
   show_passwords_.Init(prefs::kPasswordManagerAllowShowPasswords,
-                       Profile::FromWebUI(web_ui())->GetPrefs(), this);
+                       Profile::FromWebUI(web_ui())->GetPrefs(),
+                       base::Bind(&PasswordManagerHandler::UpdatePasswordLists,
+                                  base::Unretained(this),
+                                  static_cast<base::ListValue*>(NULL)));
   // We should not cache web_ui()->GetProfile(). See crosbug.com/6304.
   PasswordStore* store = GetPasswordStore();
   if (store)
     store->AddObserver(this);
 }
 
 void PasswordManagerHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("updatePasswordLists",
       base::Bind(&PasswordManagerHandler::UpdatePasswordLists,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeSavedPassword",
       base::Bind(&PasswordManagerHandler::RemoveSavedPassword,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removePasswordException",
       base::Bind(&PasswordManagerHandler::RemovePasswordException,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeAllSavedPasswords",
       base::Bind(&PasswordManagerHandler::RemoveAllSavedPasswords,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeAllPasswordExceptions",
       base::Bind(&PasswordManagerHandler::RemoveAllPasswordExceptions,
                  base::Unretained(this)));
 }
 
 void PasswordManagerHandler::OnLoginsChanged() {
   UpdatePasswordLists(NULL);
 }
 
 PasswordStore* PasswordManagerHandler::GetPasswordStore() {
-  return PasswordStoreFactory::GetForProfile(
-      Profile::FromWebUI(web_ui()),
-      Profile::EXPLICIT_ACCESS);
-}
-
-void PasswordManagerHandler::OnPreferenceChanged(PrefServiceBase* service,
-                                                 const std::string& pref_name) {
-  DCHECK_EQ(std::string(prefs::kPasswordManagerAllowShowPasswords), pref_name);
-  UpdatePasswordLists(NULL);
+  return PasswordStoreFactory::GetForProfile(Profile::FromWebUI(web_ui()),
+                                             Profile::EXPLICIT_ACCESS);
 }
 
 void PasswordManagerHandler::UpdatePasswordLists(const ListValue* args) {
   // Reset the current lists.
   password_list_.clear();
   password_exception_list_.clear();
 
   languages_ = Profile::FromWebUI(web_ui())->GetPrefs()->
       GetString(prefs::kAcceptLanguages);
   populater_.Populate();
@@ skipping 139 matching lines @@
         const std::vector<content::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
   page_->password_exception_list_.clear();
   page_->password_exception_list_.insert(page_->password_exception_list_.end(),
                                          result.begin(), result.end());
   page_->SetPasswordExceptionList();
 }
 
 }  // namespace options