[Password Generation] Use signatures for form matching

components/autofill/content/public/cpp/autofill_types_struct_traits_unittest.cc

 // Copyright 2016 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 "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/public/interfaces/test_autofill_types.mojom.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
+#include "components/autofill/core/common/signatures_util.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 
 const std::vector<const char*> kOptions = {"Option1", "Option2", "Option3",
                                            "Option4"};
 namespace {
 
@@ skipping 168 matching lines @@
   }
 
   EXPECT_EQ(expected.wait_for_username, actual.wait_for_username);
   EXPECT_EQ(expected.is_possible_change_password_form,
             actual.is_possible_change_password_form);
 }
 
 void CheckEqualPasswordFormGenerationData(
     const PasswordFormGenerationData& expected,
     const PasswordFormGenerationData& actual) {
-  EXPECT_EQ(expected.name, actual.name);
-  EXPECT_EQ(expected.action, actual.action);
-  EXPECT_EQ(expected.generation_field, actual.generation_field);
+  EXPECT_EQ(expected.form_signature, actual.form_signature);
+  EXPECT_EQ(expected.field_signature, actual.field_signature);
 }
 
 }  // namespace
 
 class AutofillTypeTraitsTestImpl : public testing::Test,
                                    public mojom::TypeTraitsTest {
  public:
   AutofillTypeTraitsTestImpl() {}
 
   mojom::TypeTraitsTestPtr GetTypeTraitsTestProxy() {
@@ skipping 183 matching lines @@
   base::RunLoop loop;
   mojom::TypeTraitsTestPtr proxy = GetTypeTraitsTestProxy();
   proxy->PassPasswordFormFillData(input, base::Bind(&ExpectPasswordFormFillData,
                                                     input, loop.QuitClosure()));
   loop.Run();
 }
 
 TEST_F(AutofillTypeTraitsTestImpl, PassPasswordFormGenerationData) {
   FormData form;
   test::CreateTestAddressFormData(&form);
-  PasswordFormGenerationData input{form.name, form.action, form.fields[0]};
+  FormSignature form_signature = CalculateFormSignature(form);
+  FieldSignature field_signature =
+      CalculateFieldSignatureForField(form.fields[0]);
+  PasswordFormGenerationData input{form_signature, field_signature};
 
   base::RunLoop loop;
   mojom::TypeTraitsTestPtr proxy = GetTypeTraitsTestProxy();
   proxy->PassPasswordFormGenerationData(
       input,
       base::Bind(&ExpectPasswordFormGenerationData, input, loop.QuitClosure()));
   loop.Run();
 }
 
 TEST_F(AutofillTypeTraitsTestImpl, PassPasswordForm) {
@@ skipping 12 matching lines @@
   CreateTestFormsPredictionsMap(&input);
 
   base::RunLoop loop;
   mojom::TypeTraitsTestPtr proxy = GetTypeTraitsTestProxy();
   proxy->PassFormsPredictionsMap(
       input, base::Bind(&ExpectFormsPredictionsMap, input, loop.QuitClosure()));
   loop.Run();
 }
 
 }  // namespace autofill