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

components/autofill/common/password_form_fill_data.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_AUTOFILL_COMMON_PASSWORD_FORM_FILL_DATA_H_
 #define COMPONENTS_AUTOFILL_COMMON_PASSWORD_FORM_FILL_DATA_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 10 matching lines @@
   // Defined so that this struct can be used as a key in a std::map.
   bool operator<(const UsernamesCollectionKey& other) const;
 
   base::string16 username;
   base::string16 password;
 };
 
 // Structure used for autofilling password forms.
 // basic_data identifies the HTML form on the page and preferred username/
 //            password for login, while
-// additional_logins is a list of other matching user/pass pairs for the form.
+// preferred_realm the signon realm of the preferred user/pass pair.
+// additional_logins_passwords is a list of other matching user/pass pairs for
+//                             the form.
+// additional_logins_realms is a list of the realms of other matching user/pass
+//                          for the form.

[Ilya Sherman, 2013/06/06 09:25:35]

I don't quite understand:  Are these supposed to be iterated over in lock-step? 
It seems better to just keep a single collection, but change the type of the map
value to be a struct that contains both the password and the realm.

[nyquist, 2013/06/07 22:51:10]

Done.

 // other_possible_usernames is a list of possible usernames in the case where we
 //     aren't completely sure that the original saved username is correct.
 //     This data is keyed by the saved username/password to ensure uniqueness,
 //     though the username is not used.
 // wait_for_username tells us whether we need to wait for the user to enter
 // a valid username before we autofill the password. By default, this is off
 // unless the PasswordManager determined there is an additional risk
 // associated with this form. This can happen, for example, if action URI's
 // of the observed form and our saved representation don't match up.
 struct PasswordFormFillData {
   typedef std::map<base::string16, base::string16> LoginCollection;
   typedef std::map<UsernamesCollectionKey,
                    std::vector<base::string16> > UsernamesCollection;
 
   FormData basic_data;
-  LoginCollection additional_logins;
+  base::string16 preferred_realm;
+  LoginCollection additional_logins_passwords;
+  LoginCollection additional_logins_realms;
   UsernamesCollection other_possible_usernames;
   bool wait_for_username;
   PasswordFormFillData();
   ~PasswordFormFillData();
 };
 
 // Create a FillData structure in preparation for autofilling a form,
 // from basic_data identifying which form to fill, and a collection of
 // matching stored logins to use as username/password values.
 // |preferred_match| should equal (address) one of matches.
 // |wait_for_username_before_autofill| is true if we should not autofill
 // anything until the user typed in a valid username and blurred the field.
 // If |enable_possible_usernames| is true, we will populate possible_usernames
 // in |result|.
 void InitPasswordFormFillData(
     const content::PasswordForm& form_on_page,
     const content::PasswordFormMap& matches,
     const content::PasswordForm* const preferred_match,
     bool wait_for_username_before_autofill,
     bool enable_other_possible_usernames,
     PasswordFormFillData* result);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_COMMON_PASSWORD_FORM_FILL_DATA_H__