[Password Manager] Don't send |UsernameCorrection| in |PasswordFormFillData| to the renderer

components/autofill/content/common/autofill_types.mojom

Index: components/autofill/content/common/autofill_types.mojom
diff --git a/components/autofill/content/common/autofill_types.mojom b/components/autofill/content/common/autofill_types.mojom
index 8a116447b35c75ea01cd591bd4da0cb030936073..d8012a15bbffc7731ae417f9b8a305ea73cbd605 100644
--- a/components/autofill/content/common/autofill_types.mojom
+++ b/components/autofill/content/common/autofill_types.mojom
@@ -117,12 +117,6 @@ struct PasswordAndRealm {
   string realm;
 };
 
-// autofill::UsernamesCollectionKey
-struct UsernamesCollectionKey {
-  string username;
-  string password;
-  string realm;
-};
 
 // autofill::PasswordFormFillData
 struct PasswordFormFillData {
@@ -133,11 +127,6 @@ struct PasswordFormFillData {
   FormFieldData password_field;
   string preferred_realm;
   map<string, PasswordAndRealm> additional_logins;
-  // TODO(leonhsl): Use map directly after http://crbug.com/628104 solved.
-  // Keys for std::map<UsernamesCollectionKey, std::vector<base::string16>>
-  array<UsernamesCollectionKey> other_possible_usernames_keys;
-  // Values for std::map<UsernamesCollectionKey, std::vector<base::string16>>
-  array<array<string>> other_possible_usernames_values;
   bool wait_for_username;
   bool is_possible_change_password_form;
 };