[Autofill] Always show available data when encountering autocomplete attributes

components/autofill/core/browser/form_structure_unittest.cc

 // Copyright 2013 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/autofill/core/browser/form_structure.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
@@ skipping 287 matching lines @@
 
   field.label = ASCIIToUTF16("Country");
   field.name = ASCIIToUTF16("country");
   field.form_control_type = "select-one";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->ShouldBeParsed());
 
   form.fields[0].form_control_type = "select-one";
+
   // Now, no text fields.
   form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->ShouldBeParsed());
+
+  // The form has two fields but one has the autocomplete attribute

[Mathieu, 2015/10/20 21:03:11]

Please make a separate test case

[sebsg, 2015/10/21 18:20:50]

Done.

+  form.fields.clear();
+
+  field.label = ASCIIToUTF16("Name");
+  field.name = ASCIIToUTF16("name");
+  field.form_control_type = "name";
+  field.autocomplete_attribute = "name";
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Address");
+  field.name = ASCIIToUTF16("Address");
+  field.form_control_type = "select-one";
+  field.autocomplete_attribute = "";
+  form.fields.push_back(field);
+
+  form_structure.reset(new FormStructure(form));
+  form_structure->ParseFieldTypesFromAutocompleteAttributes();
+  EXPECT_TRUE(form_structure->ShouldBeParsed());
 }
 
 TEST_F(FormStructureTest, HeuristicsContactInfo) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
@@ skipping 2528 matching lines @@
   field.autocomplete_attribute = "billing country";
   field.option_contents.push_back(ASCIIToUTF16("Down Under"));
   field.option_values.push_back(ASCIIToUTF16("AU"));
   field.option_contents.push_back(ASCIIToUTF16("Fr"));
   field.option_values.push_back(ASCIIToUTF16(""));
   field.option_contents.push_back(ASCIIToUTF16("Germany"));
   field.option_values.push_back(ASCIIToUTF16("GRMNY"));
   form_data.fields.push_back(field);
   FormStructure form_structure(form_data);
 
-  bool unused;
-  form_structure.ParseFieldTypesFromAutocompleteAttributes(&unused, &unused);
+  form_structure.ParseFieldTypesFromAutocompleteAttributes();
 
   // All values in <option> value= or contents are returned, set to upper case.
   std::set<base::string16> possible_values =
       form_structure.PossibleValues(ADDRESS_BILLING_COUNTRY);
   EXPECT_EQ(5U, possible_values.size());
   EXPECT_EQ(1U, possible_values.count(ASCIIToUTF16("AU")));
   EXPECT_EQ(1U, possible_values.count(ASCIIToUTF16("FR")));
   EXPECT_EQ(1U, possible_values.count(ASCIIToUTF16("DOWN UNDER")));
   EXPECT_EQ(1U, possible_values.count(ASCIIToUTF16("GERMANY")));
   EXPECT_EQ(1U, possible_values.count(ASCIIToUTF16("GRMNY")));
   EXPECT_EQ(0U, possible_values.count(ASCIIToUTF16("Fr")));
   EXPECT_EQ(0U, possible_values.count(ASCIIToUTF16("DE")));
 
   // No field for the given type; empty value set.
   EXPECT_EQ(0U, form_structure.PossibleValues(ADDRESS_HOME_COUNTRY).size());
 
   // A freeform input (<input>) allows any value (overriding other <select>s).
   FormFieldData freeform_field;
   freeform_field.autocomplete_attribute = "billing country";
   form_data.fields.push_back(freeform_field);
   FormStructure form_structure2(form_data);
-  form_structure2.ParseFieldTypesFromAutocompleteAttributes(&unused, &unused);
+  form_structure2.ParseFieldTypesFromAutocompleteAttributes();
   EXPECT_EQ(0U, form_structure2.PossibleValues(ADDRESS_BILLING_COUNTRY).size());
 }
 
 TEST_F(FormStructureTest, ParseQueryResponse) {
   FormData form;
   form.origin = GURL("http://foo.com");
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("fullname");
@@ skipping 72 matching lines @@
       "</autofillqueryresponse>";
 
   FormStructure::ParseQueryResponse(response, forms.get(), nullptr);
 
   ASSERT_GE(forms[0]->field_count(), 2U);
   EXPECT_EQ(NO_SERVER_DATA, forms[0]->field(0)->server_type());
   EXPECT_EQ(76, forms[0]->field(1)->server_type());
 }
 
 }  // namespace autofill