[password generation] Always allow generated passwords to be shown.

chrome/browser/password_manager/password_form_manager.cc

Index: chrome/browser/password_manager/password_form_manager.cc
diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index a75b3c8a987633e072a9da020d04b797cd936ed7..6a83ac0eb95a867fdd2d43fc6ebfb04c2775cb4e 100644
--- a/chrome/browser/password_manager/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -292,7 +292,8 @@ void PasswordFormManager::OnRequestDone(
   // copies to a minimum here.
 
   int best_score = 0;
-  std::vector<PasswordForm> empties;  // Empty-path matches in result set.
+  // We will make sure these forms are in the final result regardless of score.

[Ilya Sherman, 2013/09/19 01:02:20]

nit: Please try to phrase comments without using "we" or "us".  For this
comment, you might phrase it as "These forms will be in the final result
regardless of score."

[Garrett Casto, 2013/09/19 17:40:14]

Done.

+  std::vector<PasswordForm> credentials_to_keep;
   for (size_t i = 0; i < logins_result.size(); i++) {
     if (IgnoreResult(*logins_result[i])) {
       delete logins_result[i];
@@ -315,7 +316,18 @@ void PasswordFormManager::OnRequestDone(
     if ((observed_form_.scheme == PasswordForm::SCHEME_HTML) &&
         (observed_form_.signon_realm == logins_result[i]->origin.spec()) &&
         (current_score > 0) && (!logins_result[i]->blacklisted_by_user)) {
-      empties.push_back(*logins_result[i]);
+      credentials_to_keep.push_back(*logins_result[i]);
+    }
+
+    // Always keep generated passwords as part of the result set. We don't want
+    // users to generate a password on a signup form, and then not have it fill
+    // on the login form because they already have a previous login saved.
+    // TODO(gcasto): We don't want to cut credentials that were saved on signup
+    // forms even if they weren't generated, but currently it's hard to
+    // distinguish between those forms and two different login forms on the
+    // same domain. Filed http://crbug.com/294468 to look into this.
+    if (logins_result[i]->type == PasswordForm::TYPE_GENERATED) {
+      credentials_to_keep.push_back(*logins_result[i]);
     }

[Ilya Sherman, 2013/09/19 01:02:20]

nit: No need for curlies.

[Garrett Casto, 2013/09/19 17:40:14]

Done.

 
     if (current_score < best_score) {
@@ -343,11 +355,12 @@ void PasswordFormManager::OnRequestDone(
     return;
   }
 
-  for (std::vector<PasswordForm>::const_iterator it = empties.begin();
-       it != empties.end(); ++it) {
+  for (std::vector<PasswordForm>::const_iterator it =
+           credentials_to_keep.begin();
+       it != credentials_to_keep.end(); ++it) {
     // If we don't already have a result with the same username, add the
-    // lower-scored empty-path match (if it had equal score it would already be
-    // in best_matches_).
+    // lower-scored match (if it had equal score it would already be in
+    // best_matches_).
     if (best_matches_.find(it->username_value) == best_matches_.end())
       best_matches_[it->username_value] = new PasswordForm(*it);
   }