[autofill] Add support for PSL domain matching for password autofill.

components/autofill/renderer/password_autofill_agent.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 "components/autofill/renderer/password_autofill_agent.h"
 
+#include <vector>
+
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "components/autofill/common/autofill_messages.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/password_form_fill_data.h"
 #include "components/autofill/renderer/form_autofill_util.h"
 #include "content/public/common/password_form.h"
 #include "content/public/renderer/password_form_conversion_utils.h"
@@ skipping 462 matching lines @@
         form_data));
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillAgent, private:
 
 void PasswordAutofillAgent::GetSuggestions(
     const PasswordFormFillData& fill_data,
     const base::string16& input,
-    std::vector<base::string16>* suggestions) {
-  if (StartsWith(fill_data.basic_data.fields[0].value, input, false))
+    std::vector<base::string16>* suggestions,
+    std::vector<base::string16>* realms) {
+  if (StartsWith(fill_data.basic_data.fields[0].value, input, false)) {
     suggestions->push_back(fill_data.basic_data.fields[0].value);
+    realms->push_back(fill_data.preferred_realm);
+  }
 
   for (PasswordFormFillData::LoginCollection::const_iterator iter =
-           fill_data.additional_logins.begin();
-       iter != fill_data.additional_logins.end(); ++iter) {
-    if (StartsWith(iter->first, input, false))
+           fill_data.additional_logins_realms.begin();
+       iter != fill_data.additional_logins_realms.end(); ++iter) {
+    if (StartsWith(iter->first, input, false)) {
       suggestions->push_back(iter->first);
+      realms->push_back(iter->second);
+    }
   }
 
   for (PasswordFormFillData::UsernamesCollection::const_iterator iter =
            fill_data.other_possible_usernames.begin();
        iter != fill_data.other_possible_usernames.end(); ++iter) {
     for (size_t i = 0; i < iter->second.size(); ++i) {
       if (StartsWith(iter->second[i], input, false)) {
         usernames_usage_ = OTHER_POSSIBLE_USERNAME_SHOWN;
         suggestions->push_back(iter->second[i]);
       }
     }
   }
 }
 
 bool PasswordAutofillAgent::ShowSuggestionPopup(
     const PasswordFormFillData& fill_data,
     const WebKit::WebInputElement& user_input) {
   WebKit::WebFrame* frame = user_input.document().frame();
   if (!frame)
     return false;
 
   WebKit::WebView* webview = frame->view();
   if (!webview)
     return false;
 
   std::vector<base::string16> suggestions;
-  GetSuggestions(fill_data, user_input.value(), &suggestions);
+  std::vector<base::string16> suggestions_realms;
+  GetSuggestions(fill_data,
+                 user_input.value(),
+                 &suggestions,
+                 &suggestions_realms);
 
   if (disable_popup_) {
     FormData form;
     FormFieldData field;
     FindFormAndFieldForInputElement(
         user_input, &form, &field, REQUIRE_NONE);
 
     WebKit::WebInputElement selected_element = user_input;
     gfx::Rect bounding_box(selected_element.boundsInViewportSpace());
 
     float scale = web_view_->pageScaleFactor();
     gfx::RectF bounding_box_scaled(bounding_box.x() * scale,
                                    bounding_box.y() * scale,
                                    bounding_box.width() * scale,
                                    bounding_box.height() * scale);
     Send(new AutofillHostMsg_ShowPasswordSuggestions(routing_id(),
                                                      field,
                                                      bounding_box_scaled,
-                                                     suggestions));
+                                                     suggestions,
+                                                     suggestions_realms));
     return !suggestions.empty();
   }
 
 
   if (suggestions.empty()) {
     webview->hidePopups();
     return false;
   }
 
   std::vector<base::string16> labels(suggestions.size());
@@ skipping 17 matching lines @@
   base::string16 password;
 
   // Look for any suitable matches to current field text.
   if (DoUsernamesMatch(fill_data.basic_data.fields[0].value, current_username,
                        exact_username_match)) {
     username = fill_data.basic_data.fields[0].value;
     password = fill_data.basic_data.fields[1].value;
   } else {
     // Scan additional logins for a match.
     PasswordFormFillData::LoginCollection::const_iterator iter;
-    for (iter = fill_data.additional_logins.begin();
-         iter != fill_data.additional_logins.end(); ++iter) {
+    for (iter = fill_data.additional_logins_passwords.begin();
+         iter != fill_data.additional_logins_passwords.end(); ++iter) {
       if (DoUsernamesMatch(iter->first, current_username,
                            exact_username_match)) {
         username = iter->first;
         password = iter->second;
         break;
       }
     }
 
     // Check possible usernames.
     if (username.empty() && password.empty()) {
@@ skipping 84 matching lines @@
   LoginToPasswordInfoMap::iterator iter = login_to_password_info_.find(input);
   if (iter == login_to_password_info_.end())
     return false;
 
   *found_input = input;
   *found_password = iter->second;
   return true;
 }
 
 }  // namespace autofill