Fix password mgr heuristics for sites that keep the login form around after signin

chrome/browser/password_manager/password_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_manager.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 98 matching lines @@
   if (provisional_save_manager_->IsNewLogin()) {
     delegate_->AddSavePasswordInfoBar(provisional_save_manager_.release());
   } else {
     // If the save is not a new username entry, then we just want to save this
     // data (since the user already has related data saved), so don't prompt.
     provisional_save_manager_->Save();
     provisional_save_manager_.reset();
   }
 }
 
-void PasswordManager::PasswordFormsSeen(
+void PasswordManager::PasswordFormsFound(
     const std::vector<PasswordForm>& forms) {
   if (!delegate_->GetProfileForPasswordManager())
     return;
   if (!*password_manager_enabled_)
     return;
 
   // Ask the SSLManager for current security.
   bool had_ssl_error = delegate_->DidLastPageLoadEncounterSSLErrors();
 
   std::vector<PasswordForm>::const_iterator iter;
   for (iter = forms.begin(); iter != forms.end(); iter++) {
-    if (provisional_save_manager_.get() &&
-        provisional_save_manager_->DoesManage(*iter)) {
-      // The form trying to be saved has immediately re-appeared. Assume
-      // login failure and abort this save.  Fallback to pending login state
-      // since the user may try again.
-      pending_login_managers_.push_back(provisional_save_manager_.release());
+    bool ssl_valid = iter->origin.SchemeIsSecure() && !had_ssl_error;
+    PasswordFormManager* manager =
+        new PasswordFormManager(delegate_->GetProfileForPasswordManager(),
+                                this, *iter, ssl_valid);
+    pending_login_managers_.push_back(manager);
+    manager->FetchMatchingLoginsFromWebDatabase();
+  }
+}
+
+void PasswordManager::PasswordFormsVisible(
+    const std::vector<PasswordForm>& visible_forms) {
+  if (!provisional_save_manager_.get())
+    return;
+  std::vector<PasswordForm>::const_iterator iter;
+  for (iter = visible_forms.begin(); iter != visible_forms.end(); iter++) {
+    if (provisional_save_manager_->DoesManage(*iter)) {
+      // The form trying to be saved has immediately re-appeared. Assume login
+      // failure and abort this save, by clearing provisional_save_manager_.
       // Don't delete the login managers since the user may try again
       // and we want to be able to save in that case.
+      provisional_save_manager_.release();
       break;
-    } else {
-      bool ssl_valid = iter->origin.SchemeIsSecure() && !had_ssl_error;
-      PasswordFormManager* manager =
-          new PasswordFormManager(delegate_->GetProfileForPasswordManager(),
-                                  this, *iter, ssl_valid);
-      pending_login_managers_.push_back(manager);
-      manager->FetchMatchingLoginsFromWebDatabase();
     }
   }
 }
 
 void PasswordManager::Autofill(
     const PasswordForm& form_for_autofill,
     const PasswordFormMap& best_matches,
     const PasswordForm* const preferred_match) const {
   DCHECK(preferred_match);
   switch (form_for_autofill.scheme) {
@@ skipping 12 matching lines @@
       return;
     }
     default:
       if (observer_) {
         observer_->OnAutofillDataAvailable(
             UTF16ToWideHack(preferred_match->username_value),
             UTF16ToWideHack(preferred_match->password_value));
       }
   }
 }