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

components/autofill/content/common/autofill_types_struct_traits.cc

Index: components/autofill/content/common/autofill_types_struct_traits.cc
diff --git a/components/autofill/content/common/autofill_types_struct_traits.cc b/components/autofill/content/common/autofill_types_struct_traits.cc
index 055646e556b843db242922d520f2b253abc8a953..2ed7a0ebbbfc2382b580000b281770370cb22295 100644
--- a/components/autofill/content/common/autofill_types_struct_traits.cc
+++ b/components/autofill/content/common/autofill_types_struct_traits.cc
@@ -403,40 +403,6 @@ bool StructTraits<mojom::PasswordAndRealmDataView, PasswordAndRealm>::Read(
 }
 
 // static
-bool StructTraits<
-    mojom::UsernamesCollectionKeyDataView,
-    UsernamesCollectionKey>::Read(mojom::UsernamesCollectionKeyDataView data,
-                                  UsernamesCollectionKey* out) {
-  if (!data.ReadUsername(&out->username))
-    return false;
-  if (!data.ReadPassword(&out->password))
-    return false;
-  if (!data.ReadRealm(&out->realm))
-    return false;
-
-  return true;
-}
-
-// static
-void* StructTraits<mojom::PasswordFormFillDataDataView, PasswordFormFillData>::
-    SetUpContext(const PasswordFormFillData& r) {
-  // Extracts keys vector and values vector from the map, saves them as a pair.
-  auto* pair = new UsernamesCollectionKeysValuesPair();
-  for (const auto& i : r.other_possible_usernames) {
-    pair->first.push_back(i.first);
-    pair->second.push_back(i.second);
-  }
-
-  return pair;
-}
-
-// static
-void StructTraits<mojom::PasswordFormFillDataDataView, PasswordFormFillData>::
-    TearDownContext(const PasswordFormFillData& r, void* context) {
-  delete static_cast<UsernamesCollectionKeysValuesPair*>(context);
-}
-
-// static
 bool StructTraits<mojom::PasswordFormFillDataDataView, PasswordFormFillData>::
     Read(mojom::PasswordFormFillDataDataView data, PasswordFormFillData* out) {
   if (!data.ReadName(&out->name) || !data.ReadOrigin(&out->origin) ||
@@ -447,19 +413,6 @@ bool StructTraits<mojom::PasswordFormFillDataDataView, PasswordFormFillData>::
       !data.ReadAdditionalLogins(&out->additional_logins))
     return false;
 
-  // Combines keys vector and values vector to the map.
-  std::vector<UsernamesCollectionKey> keys;
-  if (!data.ReadOtherPossibleUsernamesKeys(&keys))
-    return false;
-  std::vector<std::vector<base::string16>> values;
-  if (!data.ReadOtherPossibleUsernamesValues(&values))
-    return false;
-  if (keys.size() != values.size())
-    return false;
-  out->other_possible_usernames.clear();
-  for (size_t i = 0; i < keys.size(); ++i)
-    out->other_possible_usernames.insert({keys[i], values[i]});
-
   out->wait_for_username = data.wait_for_username();
   out->is_possible_change_password_form =
       data.is_possible_change_password_form();