Profile refactoring: Remove all PasswordStore code from the Profile interface.

chrome/browser/ui/webui/options2/password_manager_handler2.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/options2/password_manager_handler2.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 87 matching lines @@
   web_ui()->RegisterMessageCallback("removeAllPasswordExceptions",
       base::Bind(&PasswordManagerHandler::RemoveAllPasswordExceptions,
                  base::Unretained(this)));
 }
 
 void PasswordManagerHandler::OnLoginsChanged() {
   UpdatePasswordLists(NULL);
 }
 
 PasswordStore* PasswordManagerHandler::GetPasswordStore() {
-  return Profile::FromWebUI(web_ui())->
-      GetPasswordStore(Profile::EXPLICIT_ACCESS);
+  return PasswordStoreFactory::GetForProfile(
+      Profile::FromWebUI(web_ui()),
+      Profile::EXPLICIT_ACCESS);
 }
 
 void PasswordManagerHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* pref_name = content::Details<std::string>(details).ptr();
     if (*pref_name == prefs::kPasswordManagerAllowShowPasswords) {
       UpdatePasswordLists(NULL);
@@ skipping 153 matching lines @@
         const std::vector<webkit::forms::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
   page_->password_exception_list_.reset();
   page_->password_exception_list_.insert(page_->password_exception_list_.end(),
                                          result.begin(), result.end());
   page_->SetPasswordExceptionList();
 }
 
 }  // namespace options2