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

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 51 matching lines @@
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_change.h"
+#include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
@@ skipping 3894 matching lines @@
   if (!password_dict->HasKey("signon_realm")) {
     AutomationJSONReply(this, reply_message).SendError(
         "Password must include a value for 'signon_realm.'");
     return;
   }
 
   webkit::forms::PasswordForm new_password =
       GetPasswordFormFromDict(*password_dict);
 
   // Use IMPLICIT_ACCESS since new passwords aren't added in incognito mode.
-  PasswordStore* password_store =
-      browser->profile()->GetPasswordStore(Profile::IMPLICIT_ACCESS);
+  PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
+      browser->profile(), Profile::IMPLICIT_ACCESS);
 
   // The password store does not exist for an incognito window.
   if (password_store == NULL) {
     scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
     return_value->SetBoolean("password_added", false);
     AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
     return;
   }
 
   // This observer will delete itself.
@@ skipping 24 matching lines @@
   // Check here before calling GetPasswordFormFromDict.
   if (!password_dict->HasKey("signon_realm")) {
     AutomationJSONReply(this, reply_message).SendError(
         "Password must include a value for 'signon_realm.'");
     return;
   }
   webkit::forms::PasswordForm to_remove =
       GetPasswordFormFromDict(*password_dict);
 
   // Use EXPLICIT_ACCESS since passwords can be removed in incognito mode.
-  PasswordStore* password_store =
-      browser->profile()->GetPasswordStore(Profile::EXPLICIT_ACCESS);
+  PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
+      browser->profile(), Profile::EXPLICIT_ACCESS);
   if (password_store == NULL) {
     AutomationJSONReply(this, reply_message).SendError(
         "Unable to get password store.");
     return;
   }
 
   // This observer will delete itself.
   PasswordStoreLoginsChangedObserver* observer =
       new PasswordStoreLoginsChangedObserver(
           this, reply_message, PasswordStoreChange::REMOVE, "");
   observer->Init();
 
   password_store->RemoveLogin(to_remove);
 }
 
 // Sample json input: { "command": "GetSavedPasswords" }
 // Refer to GetSavedPasswords() in chrome/test/pyautolib/pyauto.py for sample
 // json output.
 void TestingAutomationProvider::GetSavedPasswords(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   // Use EXPLICIT_ACCESS since saved passwords can be retrieved in
   // incognito mode.
-  PasswordStore* password_store =
-      browser->profile()->GetPasswordStore(Profile::EXPLICIT_ACCESS);
+  PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
+      browser->profile(), Profile::EXPLICIT_ACCESS);
 
   if (password_store == NULL) {
     AutomationJSONReply reply(this, reply_message);
     reply.SendError("Unable to get password store.");
     return;
   }
   password_store->GetAutofillableLogins(
       new AutomationProviderGetPasswordsObserver(this, reply_message));
   // Observer deletes itself after sending the result.
 }
@@ skipping 2999 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }