| Index: components/autofill/core/browser/form_structure_unittest.cc
|
| diff --git a/components/autofill/core/browser/form_structure_unittest.cc b/components/autofill/core/browser/form_structure_unittest.cc
|
| index c1ecb59405c73c390842de1827d875dbbda0724e..8206c42629e9995d669b2aee74ecb56944b710b3 100644
|
| --- a/components/autofill/core/browser/form_structure_unittest.cc
|
| +++ b/components/autofill/core/browser/form_structure_unittest.cc
|
| @@ -149,7 +149,7 @@ TEST_F(FormStructureTest, AutofillCount) {
|
|
|
| // Only text and select fields that are heuristically matched are counted.
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_EQ(3U, form_structure->autofill_count());
|
|
|
| // Add a field with should_autocomplete=false. This should not be considered a
|
| @@ -161,7 +161,7 @@ TEST_F(FormStructureTest, AutofillCount) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_EQ(4U, form_structure->autofill_count());
|
| }
|
|
|
| @@ -196,7 +196,7 @@ TEST_F(FormStructureTest, IsAutofillable) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_FALSE(form_structure->IsAutofillable());
|
|
|
| // We now have three text fields, but only two auto-fillable fields.
|
| @@ -211,7 +211,7 @@ TEST_F(FormStructureTest, IsAutofillable) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_FALSE(form_structure->IsAutofillable());
|
|
|
| // We now have three auto-fillable fields.
|
| @@ -221,19 +221,19 @@ TEST_F(FormStructureTest, IsAutofillable) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // The target cannot include http(s)://*/search...
|
| form.action = GURL("http://google.com/search?q=hello");
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_FALSE(form_structure->IsAutofillable());
|
|
|
| // But search can be in the URL.
|
| form.action = GURL("http://search.com/?q=hello");
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| }
|
|
|
| @@ -405,7 +405,7 @@ TEST_F(FormStructureTest, HeuristicsContactInfo) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -457,7 +457,7 @@ TEST_F(FormStructureTest, HeuristicsAutocompleteAttribute) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -496,7 +496,7 @@ TEST_F(FormStructureTest, Heuristics_FormlessNonCheckoutForm) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -512,7 +512,7 @@ TEST_F(FormStructureTest, Heuristics_FormlessNonCheckoutForm) {
|
| form.is_form_tag = false;
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -553,7 +553,7 @@ TEST_F(FormStructureTest, StripCommonNamePrefix) {
|
| form.fields.push_back(field);
|
|
|
| std::unique_ptr<FormStructure> form_structure(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -593,7 +593,7 @@ TEST_F(FormStructureTest, StripCommonNamePrefix_SmallPrefix) {
|
| form.fields.push_back(field);
|
|
|
| std::unique_ptr<FormStructure> form_structure(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -629,7 +629,7 @@ TEST_F(FormStructureTest, IsCompleteCreditCardForm_Minimal) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| EXPECT_TRUE(form_structure->IsCompleteCreditCardForm());
|
| }
|
| @@ -667,7 +667,7 @@ TEST_F(FormStructureTest, IsCompleteCreditCardForm_Full) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| EXPECT_TRUE(form_structure->IsCompleteCreditCardForm());
|
| }
|
| @@ -685,7 +685,7 @@ TEST_F(FormStructureTest, IsCompleteCreditCardForm_OnlyCCNumber) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| EXPECT_FALSE(form_structure->IsCompleteCreditCardForm());
|
| }
|
| @@ -726,7 +726,7 @@ TEST_F(FormStructureTest, IsCompleteCreditCardForm_AddressForm) {
|
| field.name = base::string16();
|
| form.fields.push_back(field);
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| EXPECT_FALSE(form_structure->IsCompleteCreditCardForm());
|
| }
|
| @@ -756,7 +756,7 @@ TEST_F(FormStructureTest, HeuristicsAutocompleteAttributePhoneTypes) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -796,7 +796,7 @@ TEST_F(FormStructureTest,
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| EXPECT_TRUE(form_structure->ShouldBeCrowdsourced());
|
|
|
| @@ -834,7 +834,7 @@ TEST_F(FormStructureTest,
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| EXPECT_TRUE(form_structure->ShouldBeCrowdsourced());
|
|
|
| @@ -877,7 +877,7 @@ TEST_F(FormStructureTest,
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| EXPECT_TRUE(form_structure->ShouldBeCrowdsourced());
|
|
|
| @@ -909,7 +909,7 @@ TEST_F(FormStructureTest,
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_FALSE(form_structure->IsAutofillable());
|
| EXPECT_FALSE(form_structure->ShouldBeCrowdsourced());
|
|
|
| @@ -944,7 +944,7 @@ TEST_F(FormStructureTest,
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_FALSE(form_structure->IsAutofillable());
|
| EXPECT_FALSE(form_structure->ShouldBeCrowdsourced());
|
|
|
| @@ -987,7 +987,7 @@ TEST_F(FormStructureTest, PasswordFormShouldBeCrowdsourced) {
|
| form.fields.push_back(field);
|
|
|
| FormStructure form_structure(form);
|
| - form_structure.DetermineHeuristicTypes();
|
| + form_structure.DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure.ShouldBeCrowdsourced());
|
| }
|
|
|
| @@ -1038,7 +1038,7 @@ TEST_F(FormStructureTest, HeuristicsAutocompleteAttributeWithSections) {
|
| form.fields.push_back(field);
|
|
|
| FormStructure form_structure(form);
|
| - form_structure.DetermineHeuristicTypes();
|
| + form_structure.DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure.IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -1083,7 +1083,7 @@ TEST_F(FormStructureTest,
|
| form.fields.push_back(field);
|
|
|
| FormStructure form_structure(form);
|
| - form_structure.DetermineHeuristicTypes();
|
| + form_structure.DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| // Expect the correct number of fields.
|
| ASSERT_EQ(6U, form_structure.field_count());
|
| @@ -1112,7 +1112,7 @@ TEST_F(FormStructureTest, HeuristicsAutocompleteAttributeWithSectionsRepeated) {
|
| form.fields.push_back(field);
|
|
|
| FormStructure form_structure(form);
|
| - form_structure.DetermineHeuristicTypes();
|
| + form_structure.DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| // Expect the correct number of fields.
|
| ASSERT_EQ(2U, form_structure.field_count());
|
| @@ -1149,7 +1149,7 @@ TEST_F(FormStructureTest, HeuristicsDontOverrideAutocompleteAttributeSections) {
|
| form.fields.push_back(field);
|
|
|
| FormStructure form_structure(form);
|
| - form_structure.DetermineHeuristicTypes();
|
| + form_structure.DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| // Expect the correct number of fields.
|
| ASSERT_EQ(4U, form_structure.field_count());
|
| @@ -1213,7 +1213,7 @@ TEST_F(FormStructureTest, HeuristicsSample8) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(10U, form_structure->field_count());
|
| ASSERT_EQ(9U, form_structure->autofill_count());
|
| @@ -1279,7 +1279,7 @@ TEST_F(FormStructureTest, HeuristicsSample6) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(7U, form_structure->field_count());
|
| ASSERT_EQ(6U, form_structure->autofill_count());
|
| @@ -1344,7 +1344,7 @@ TEST_F(FormStructureTest, HeuristicsLabelsOnly) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(8U, form_structure->field_count());
|
| ASSERT_EQ(7U, form_structure->autofill_count());
|
| @@ -1401,7 +1401,7 @@ TEST_F(FormStructureTest, HeuristicsCreditCardInfo) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(6U, form_structure->field_count());
|
| ASSERT_EQ(5U, form_structure->autofill_count());
|
| @@ -1461,7 +1461,7 @@ TEST_F(FormStructureTest, HeuristicsCreditCardInfoWithUnknownCardField) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(7U, form_structure->field_count());
|
| ASSERT_EQ(5U, form_structure->autofill_count());
|
| @@ -1508,7 +1508,7 @@ TEST_F(FormStructureTest, ThreeAddressLines) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(4U, form_structure->field_count());
|
| ASSERT_EQ(4U, form_structure->autofill_count());
|
| @@ -1548,7 +1548,7 @@ TEST_F(FormStructureTest, SurplusAddressLinesIgnored) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| ASSERT_EQ(4U, form_structure->field_count());
|
| ASSERT_EQ(3U, form_structure->autofill_count());
|
|
|
| @@ -1591,7 +1591,7 @@ TEST_F(FormStructureTest, ThreeAddressLinesExpedia) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(4U, form_structure->field_count());
|
| EXPECT_EQ(4U, form_structure->autofill_count());
|
| @@ -1629,7 +1629,7 @@ TEST_F(FormStructureTest, TwoAddressLinesEbay) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(3U, form_structure->field_count());
|
| ASSERT_EQ(3U, form_structure->autofill_count());
|
| @@ -1662,7 +1662,7 @@ TEST_F(FormStructureTest, HeuristicsStateWithProvince) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(3U, form_structure->field_count());
|
| ASSERT_EQ(3U, form_structure->autofill_count());
|
| @@ -1728,7 +1728,7 @@ TEST_F(FormStructureTest, HeuristicsWithBilling) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(11U, form_structure->field_count());
|
| ASSERT_EQ(11U, form_structure->autofill_count());
|
| @@ -1777,7 +1777,7 @@ TEST_F(FormStructureTest, ThreePartPhoneNumber) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
| ASSERT_EQ(4U, form_structure->field_count());
|
| ASSERT_EQ(4U, form_structure->autofill_count());
|
| @@ -1822,7 +1822,7 @@ TEST_F(FormStructureTest, HeuristicsInfernoCC) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -1876,7 +1876,7 @@ TEST_F(FormStructureTest, HeuristicsInferCCNames_NamesNotFirst) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -1934,7 +1934,7 @@ TEST_F(FormStructureTest, HeuristicsInferCCNames_NamesFirst) {
|
| form.fields.push_back(field);
|
|
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
| EXPECT_TRUE(form_structure->IsAutofillable());
|
|
|
| // Expect the correct number of fields.
|
| @@ -2117,7 +2117,7 @@ TEST_F(FormStructureTest, EncodeUploadRequest) {
|
| std::vector<ServerFieldTypeSet> possible_field_types;
|
| FormData form;
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| FormFieldData field;
|
| field.form_control_type = "text";
|
| @@ -2293,7 +2293,7 @@ TEST_F(FormStructureTest,
|
| std::vector<ServerFieldTypeSet> possible_field_types;
|
| FormData form;
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| FormFieldData field;
|
| field.label = ASCIIToUTF16("First Name");
|
| @@ -2432,7 +2432,7 @@ TEST_F(FormStructureTest, EncodeUploadRequest_WithAutocomplete) {
|
| std::vector<ServerFieldTypeSet> possible_field_types;
|
| FormData form;
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| FormFieldData field;
|
| field.form_control_type = "text";
|
| @@ -2503,7 +2503,7 @@ TEST_F(FormStructureTest, EncodeUploadRequest_ObservedSubmissionFalse) {
|
| std::vector<ServerFieldTypeSet> possible_field_types;
|
| FormData form;
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| FormFieldData field;
|
| field.form_control_type = "text";
|
| @@ -2572,7 +2572,7 @@ TEST_F(FormStructureTest, EncodeUploadRequest_WithLabels) {
|
| std::vector<ServerFieldTypeSet> possible_field_types;
|
| FormData form;
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| FormFieldData field;
|
| field.form_control_type = "text";
|
| @@ -2709,7 +2709,7 @@ TEST_F(FormStructureTest, EncodeUploadRequest_WithFormName) {
|
| // Setting the form name which we expect to see in the upload.
|
| form.name = ASCIIToUTF16("myform");
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| FormFieldData field;
|
| field.form_control_type = "text";
|
| @@ -2771,7 +2771,7 @@ TEST_F(FormStructureTest, EncodeUploadRequestPartialMetadata) {
|
| std::vector<ServerFieldTypeSet> possible_field_types;
|
| FormData form;
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| FormFieldData field;
|
| field.form_control_type = "text";
|
| @@ -2844,7 +2844,7 @@ TEST_F(FormStructureTest, EncodeUploadRequest_DisabledMetadataTrial) {
|
| std::vector<ServerFieldTypeSet> possible_field_types;
|
| FormData form;
|
| form_structure.reset(new FormStructure(form));
|
| - form_structure->DetermineHeuristicTypes();
|
| + form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| FormFieldData field;
|
| field.form_control_type = "text";
|
| @@ -3772,7 +3772,7 @@ TEST_F(FormStructureTest, ParseQueryResponseAuthorDefinedTypes) {
|
| FormStructure form_structure(form);
|
| std::vector<FormStructure*> forms;
|
| forms.push_back(&form_structure);
|
| - forms.front()->DetermineHeuristicTypes();
|
| + forms.front()->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
|
|
|
| AutofillQueryResponseContents response;
|
| response.add_field()->set_autofill_type(EMAIL_ADDRESS);
|
|
|