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

chrome/browser/password_manager/password_form_manager.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/password_manager/password_form_manager.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/password_manager/password_store.h"
+#include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "webkit/forms/password_form_dom_manager.h"
 
 using base::Time;
 using webkit::forms::PasswordForm;
 using webkit::forms::PasswordFormMap;
 
 PasswordFormManager::PasswordFormManager(Profile* profile,
                                          PasswordManager* password_manager,
                                          const PasswordForm& observed_form,
@@ skipping 83 matching lines @@
   // Configure the form about to be saved for blacklist status.
   pending_credentials_.preferred = true;
   pending_credentials_.blacklisted_by_user = true;
   pending_credentials_.username_value.clear();
   pending_credentials_.password_value.clear();
 
   // Retroactively forget existing matches for this form, so we NEVER prompt or
   // autofill it again.
   if (!best_matches_.empty()) {
     PasswordFormMap::const_iterator iter;
-    PasswordStore* password_store =
-        profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS);
+    PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
+        profile_, Profile::EXPLICIT_ACCESS);
     if (!password_store) {
       NOTREACHED();
       return;
     }
     for (iter = best_matches_.begin(); iter != best_matches_.end(); ++iter) {
       // We want to remove existing matches for this form so that the exact
       // origin match with |blackisted_by_user == true| is the only result that
       // shows up in the future for this origin URL. However, we don't want to
       // delete logins that were actually saved on a different page (hence with
       // different origin URL) and just happened to match this form because of
@@ skipping 63 matching lines @@
   if (IsNewLogin())
     SaveAsNewLogin(true);
   else
     UpdateLogin();
 }
 
 void PasswordFormManager::FetchMatchingLoginsFromPasswordStore() {
   DCHECK_EQ(state_, PRE_MATCHING_PHASE);
   DCHECK(!pending_login_query_);
   state_ = MATCHING_PHASE;
-  PasswordStore* password_store =
-      profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS);
+  PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (!password_store) {
     NOTREACHED();
     return;
   }
   pending_login_query_ = password_store->GetLogins(observed_form_, this);
 }
 
 bool PasswordFormManager::HasCompletedMatching() {
   return state_ == POST_MATCHING_PHASE;
 }
@@ skipping 126 matching lines @@
 void PasswordFormManager::SaveAsNewLogin(bool reset_preferred_login) {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   DCHECK(IsNewLogin());
   // The new_form is being used to sign in, so it is preferred.
   DCHECK(pending_credentials_.preferred);
   // new_form contains the same basic data as observed_form_ (because its the
   // same form), but with the newly added credentials.
 
   DCHECK(!profile_->IsOffTheRecord());
 
-  PasswordStore* password_store =
-      profile_->GetPasswordStore(Profile::IMPLICIT_ACCESS);
+  PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
+      profile_, Profile::IMPLICIT_ACCESS);
   if (!password_store) {
     NOTREACHED();
     return;
   }
 
   pending_credentials_.date_created = Time::Now();
   password_store->AddLogin(pending_credentials_);
 
   if (reset_preferred_login) {
     UpdatePreferredLoginState(password_store);
@@ skipping 19 matching lines @@
 void PasswordFormManager::UpdateLogin() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   DCHECK(preferred_match_);
   // If we're doing an Update, we either autofilled correctly and need to
   // update the stats, or the user typed in a new password for autofilled
   // username, or the user selected one of the non-preferred matches,
   // thus requiring a swap of preferred bits.
   DCHECK(!IsNewLogin() && pending_credentials_.preferred);
   DCHECK(!profile_->IsOffTheRecord());
 
-  PasswordStore* password_store =
-      profile_->GetPasswordStore(Profile::IMPLICIT_ACCESS);
+  PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
+      profile_, Profile::IMPLICIT_ACCESS);
   if (!password_store) {
     NOTREACHED();
     return;
   }
 
   UpdatePreferredLoginState(password_store);
 
   // Update the new preferred login.
   // Note origin.spec().length > signon_realm.length implies the origin has a
   // path, since signon_realm is a prefix of origin for HTML password forms.
@@ skipping 71 matching lines @@
   return score;
 }
 
 void PasswordFormManager::SubmitPassed() {
   submit_result_ = kSubmitResultPassed;
 }
 
 void PasswordFormManager::SubmitFailed() {
   submit_result_ = kSubmitResultFailed;
 }