[Password Generation] Use signatures for form matching

components/password_manager/core/browser/password_generation_manager_unittest.cc

 // Copyright 2014 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/password_manager/core/browser/password_generation_manager.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_generation_data.h"
+#include "components/autofill/core/common/signatures_util.h"
 #include "components/password_manager/core/browser/password_autofill_manager.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
 #include "components/password_manager/core/browser/stub_password_manager_driver.h"
 #include "components/password_manager/core/browser/test_password_store.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/variations/entropy_provider.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
+using autofill::FormStructure;
 using base::ASCIIToUTF16;
 using testing::_;
 
 namespace password_manager {
 
 namespace {
 
 class TestPasswordManagerDriver : public StubPasswordManagerDriver {
  public:
   explicit TestPasswordManagerDriver(PasswordManagerClient* client)
@@ skipping 138 matching lines @@
   username.form_control_type = "text";
   login_form.fields.push_back(username);
   autofill::FormFieldData password;
   password.label = ASCIIToUTF16("password");
   password.name = ASCIIToUTF16("password");
   password.form_control_type = "password";
   login_form.fields.push_back(password);
   autofill::FormStructure form1(login_form);
   std::vector<autofill::FormStructure*> forms;
   forms.push_back(&form1);
+
   autofill::FormData account_creation_form;
   account_creation_form.origin = GURL("http://accounts.yahoo.com/");
   account_creation_form.action = GURL("http://accounts.yahoo.com/signup");
   account_creation_form.name = ASCIIToUTF16("account_creation_form");
   account_creation_form.fields.push_back(username);
   account_creation_form.fields.push_back(password);
   autofill::FormFieldData confirm_password;
   confirm_password.label = ASCIIToUTF16("confirm_password");
   confirm_password.name = ASCIIToUTF16("password");
   confirm_password.form_control_type = "password";
   account_creation_form.fields.push_back(confirm_password);
+  autofill::FormSignature account_creation_form_signature =
+      autofill::CalculateFormSignature(account_creation_form);
+  autofill::FieldSignature account_creation_field_signature =
+      autofill::CalculateFieldSignatureForField(password);
   autofill::FormStructure form2(account_creation_form);
   forms.push_back(&form2);
+
   autofill::FormData change_password_form;
   change_password_form.origin = GURL("http://accounts.yahoo.com/");
   change_password_form.action = GURL("http://accounts.yahoo.com/change");
   change_password_form.name = ASCIIToUTF16("change_password_form");
   change_password_form.fields.push_back(password);
   change_password_form.fields[0].name = ASCIIToUTF16("new_password");
   change_password_form.fields.push_back(confirm_password);
   autofill::FormStructure form3(change_password_form);
+  autofill::FormSignature change_password_form_signature =
+      autofill::CalculateFormSignature(change_password_form);
+  autofill::FieldSignature change_password_field_signature =
+      autofill::CalculateFieldSignatureForField(change_password_form.fields[0]);
   forms.push_back(&form3);
 
   // Simulate the server response to set the field types.
   // The server response numbers mean:
   // EMAIL_ADDRESS = 9
   // PASSWORD = 75
   // ACCOUNT_CREATION_PASSWORD = 76
   // NEW_PASSWORD = 88
   autofill::AutofillQueryResponseContents response;
   response.add_field()->set_autofill_type(9);
   response.add_field()->set_autofill_type(75);
   response.add_field()->set_autofill_type(9);
   response.add_field()->set_autofill_type(76);
   response.add_field()->set_autofill_type(75);
   response.add_field()->set_autofill_type(88);
   response.add_field()->set_autofill_type(88);
 
   std::string response_string;
   ASSERT_TRUE(response.SerializeToString(&response_string));
   autofill::FormStructure::ParseQueryResponse(response_string, forms, NULL);
 
   DetectFormsEligibleForGeneration(forms);
   EXPECT_EQ(2u, GetTestDriver()->GetFoundEligibleForGenerationForms().size());
-  EXPECT_EQ(GURL("http://accounts.yahoo.com/signup"),
-            GetTestDriver()->GetFoundEligibleForGenerationForms()[0].action);
-  EXPECT_EQ(account_creation_form.name,
-            GetTestDriver()->GetFoundEligibleForGenerationForms()[0].name);
-  EXPECT_EQ(password.name, GetTestDriver()
-                               ->GetFoundEligibleForGenerationForms()[0]
-                               .generation_field.name);
-  EXPECT_EQ(GURL("http://accounts.yahoo.com/change"),
-            GetTestDriver()->GetFoundEligibleForGenerationForms()[1].action);
-  EXPECT_EQ(ASCIIToUTF16("new_password"),
-            GetTestDriver()
-                ->GetFoundEligibleForGenerationForms()[1]
-                .generation_field.name);
-  EXPECT_EQ(change_password_form.name,
-            GetTestDriver()->GetFoundEligibleForGenerationForms()[1].name);
+  EXPECT_EQ(
+      account_creation_form_signature,
+      GetTestDriver()->GetFoundEligibleForGenerationForms()[0].form_signature);
+  EXPECT_EQ(
+      account_creation_field_signature,
+      GetTestDriver()->GetFoundEligibleForGenerationForms()[0].field_signature);
+
+  EXPECT_EQ(
+      change_password_form_signature,
+      GetTestDriver()->GetFoundEligibleForGenerationForms()[1].form_signature);
+  EXPECT_EQ(
+      change_password_field_signature,
+      GetTestDriver()->GetFoundEligibleForGenerationForms()[1].field_signature);
 }
 
 TEST_F(PasswordGenerationManagerTest, UpdatePasswordSyncStateIncognito) {
   // Disable password manager by going incognito. Even though password
   // syncing is enabled, generation should still
   // be disabled.
   EXPECT_CALL(*client_, IsOffTheRecord()).WillRepeatedly(testing::Return(true));
   PrefService* prefs = client_->GetPrefs();
   prefs->SetBoolean(prefs::kPasswordManagerSavingEnabled, true);
   EXPECT_CALL(*client_, GetPasswordSyncState())
@@ skipping 15 matching lines @@
       field_trial = base::FieldTrialList::CreateFieldTrial(
           "AutofillFieldMetadata", "Enabled");
       EXPECT_CALL(*GetTestDriver(), AllowToRunFormClassifier())
           .WillOnce(testing::Return());
     }
     GetGenerationManager()->CheckIfFormClassifierShouldRun();
   }
 }
 
 }  // namespace password_manager