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

components/autofill/common/password_form_fill_data.cc

 // Copyright 2011 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/common/password_form_fill_data.h"
 
 #include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "components/autofill/common/form_field_data.h"
 
+namespace {

[Ilya Sherman, 2013/06/19 23:41:14]

nit: Please leave a blank line after this one.

[nyquist, 2013/06/21 21:01:27]

Done.

+std::string GetPreferredSignonRealm(const content::PasswordForm* form) {

[Ilya Sherman, 2013/06/19 23:41:14]

nit: Can this be passed by const-reference?

[nyquist, 2013/06/21 21:01:27]

Done.

+  if (form->IsPublicSuffixMatch())
+    return form->original_signon_realm;
+  else
+    return form->signon_realm;
+}
+
+}  // namespace
+
 namespace autofill {
 
 UsernamesCollectionKey::UsernamesCollectionKey() {}
 
 UsernamesCollectionKey::~UsernamesCollectionKey() {}
 
 bool UsernamesCollectionKey::operator<(
     const UsernamesCollectionKey& other) const {
   if (username != other.username)
     return username < other.username;
@@ skipping 24 matching lines @@
   password_field.value = preferred_match->password_value;
   password_field.form_control_type = "password";
 
   // Fill basic form data.
   result->basic_data.origin = form_on_page.origin;
   result->basic_data.action = form_on_page.action;
   result->basic_data.fields.push_back(username_field);
   result->basic_data.fields.push_back(password_field);
   result->wait_for_username = wait_for_username_before_autofill;
 
+  result->preferred_realm = GetPreferredSignonRealm(preferred_match);
+
   // Copy additional username/value pairs.
   content::PasswordFormMap::const_iterator iter;
   for (iter = matches.begin(); iter != matches.end(); iter++) {
-    if (iter->second != preferred_match)
-      result->additional_logins[iter->first] = iter->second->password_value;
+    if (iter->second != preferred_match) {
+      PasswordAndRealm value;
+      value.password = iter->second->password_value;
+      value.realm = GetPreferredSignonRealm(iter->second);
+      result->additional_logins[iter->first] = value;
+    }
     if (enable_other_possible_usernames &&
         !iter->second->other_possible_usernames.empty()) {
       // Note that there may be overlap between other_possible_usernames and
       // other saved usernames or with other other_possible_usernames. For now
       // we will ignore this overlap as it should be a rare occurence. We may
       // want to revisit this in the future.
       UsernamesCollectionKey key;
       key.username = iter->first;
       key.password = iter->second->password_value;
       result->other_possible_usernames[key] =
           iter->second->other_possible_usernames;
     }
   }
 }
 
 }  // namespace autofill