Fixed handling of preferred login info in password manager.

chrome/browser/password_manager/password_form_manager.cc

 // Copyright (c) 2006-2008 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/string_util.h"
 #include "chrome/browser/password_manager/password_manager.h"
@@ skipping 102 matching lines @@
       // 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
       // the scoring algorithm. See bug 1204493.
       if (iter->second->origin == observed_form_.origin)
         password_store->RemoveLogin(*iter->second);
     }
   }
 
   // Save the pending_credentials_ entry marked as blacklisted.
-  SaveAsNewLogin();
+  SaveAsNewLogin(false);
 }
 
 bool PasswordFormManager::IsNewLogin() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   return is_new_login_;
 }
 
 void PasswordFormManager::ProvisionallySave(const PasswordForm& credentials) {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   DCHECK(DoesManage(credentials));
@@ skipping 20 matching lines @@
 
   pending_credentials_.password_value = credentials.password_value;
   pending_credentials_.preferred = credentials.preferred;
 }
 
 void PasswordFormManager::Save() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   DCHECK(!profile_->IsOffTheRecord());
 
   if (IsNewLogin())
-    SaveAsNewLogin();
+    SaveAsNewLogin(true);
   else
     UpdateLogin();
 }
 
 void PasswordFormManager::FetchMatchingLoginsFromWebDatabase() {
   DCHECK_EQ(state_, PRE_MATCHING_PHASE);
   DCHECK(!pending_login_query_);
   state_ = MATCHING_PHASE;
   PasswordStore* password_store =
       profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS);
@@ skipping 111 matching lines @@
     return true;
   }
   // Don't match an invalid SSL form with one saved under secure
   // circumstances.
   if (form.ssl_valid && !observed_form_.ssl_valid) {
     return true;
   }
   return false;
 }
 
-void PasswordFormManager::SaveAsNewLogin() {
+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);
   if (!password_store) {
     NOTREACHED();
     return;
   }
 
   pending_credentials_.date_created = Time::Now();
   password_store->AddLogin(pending_credentials_);
+
+  if (reset_preferred_login) {
+    UpdatePreferredLoginState(password_store);
+  }
+}
+
+void PasswordFormManager::UpdatePreferredLoginState(
+    PasswordStore* password_store) {
+  DCHECK(password_store);
+  PasswordFormMap::iterator iter;
+  for (iter = best_matches_.begin(); iter != best_matches_.end(); iter++) {
+    if (iter->second->username_value != pending_credentials_.username_value &&
+        iter->second->preferred) {
+        // This wasn't the selected login but it used to be preferred.
+        iter->second->preferred = false;
+        password_store->UpdateLogin(*iter->second);
+    }
+  }
 }
 
 void PasswordFormManager::UpdateLogin() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   DCHECK(preferred_match_);
   // If we're doing an Update, its because we autofilled a form and the user
   // submitted it with a possibly new password value, page security, or 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);
   if (!password_store) {
     NOTREACHED();
     return;
   }
 
-  // Update all matches to reflect new preferred status.
-  PasswordFormMap::iterator iter;
-  for (iter = best_matches_.begin(); iter != best_matches_.end(); iter++) {
-    if ((iter->second->username_value != pending_credentials_.username_value) &&
-         iter->second->preferred) {
-      // This wasn't the selected login but it used to be preferred.
-      iter->second->preferred = false;
-      password_store->UpdateLogin(*iter->second);
-    }
-  }
+  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.
   if ((observed_form_.scheme == PasswordForm::SCHEME_HTML) &&
       (observed_form_.origin.spec().length() >
        observed_form_.signon_realm.length()) &&
       (observed_form_.signon_realm == pending_credentials_.origin.spec())) {
     // The user logged in successfully with one of our autofilled logins on a
     // page with non-empty path, but the autofilled entry was initially saved/
     // imported with an empty path. Rather than just mark this entry preferred,
@@ skipping 66 matching lines @@
     if (candidate.password_element == observed_form_.password_element)
       score += 1 << 2;
     if (candidate.submit_element == observed_form_.submit_element)
       score += 1 << 1;
     if (candidate.username_element == observed_form_.username_element)
       score += 1 << 0;
   }
 
   return score;
 }