[Autofill] Update the autocomplete types implementation to match the current HTML spec.

chrome/browser/autofill/autofill_manager_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 286 matching lines @@
 
 void ExpectFilledField(const char* expected_label,
                        const char* expected_name,
                        const char* expected_value,
                        const char* expected_form_control_type,
                        const FormFieldData& field) {
   SCOPED_TRACE(expected_label);
   EXPECT_EQ(UTF8ToUTF16(expected_label), field.label);
   EXPECT_EQ(UTF8ToUTF16(expected_name), field.name);
   EXPECT_EQ(UTF8ToUTF16(expected_value), field.value);
-  EXPECT_EQ(UTF8ToUTF16(expected_form_control_type), field.form_control_type);
+  EXPECT_EQ(expected_form_control_type, field.form_control_type);
 }
 
 // Verifies that the |filled_form| has been filled with the given data.
 // Verifies address fields if |has_address_fields| is true, and verifies
 // credit card fields if |has_credit_card_fields| is true. Verifies both if both
 // are true. |use_month_type| is used for credit card input month type.
 void ExpectFilledForm(int page_id,
                       const FormData& filled_form,
                       int expected_page_id,
                       const char* first,
@@ skipping 1668 matching lines @@
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("https://myform.com/form.html");
   form.action = GURL("https://myform.com/submit.html");
   form.user_submitted = true;
 
   FormFieldData field;
 
   autofill_test::CreateTestFormField("", "country", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("section-billing country");
+  field.autocomplete_attribute = "section-billing country";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "firstname", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("given-name");
+  field.autocomplete_attribute = "given-name";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "lastname", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("surname");
+  field.autocomplete_attribute = "family-name";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "address", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("section-billing street-address");
+  field.autocomplete_attribute = "section-billing street-address";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "city", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("section-billing locality");
+  field.autocomplete_attribute = "section-billing locality";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "state", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("section-billing administrative-area");
+  field.autocomplete_attribute = "section-billing region";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "zip", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("section-billing postal-code");
+  field.autocomplete_attribute = "section-billing postal-code";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "ccname", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("section-billing cc-full-name");
+  field.autocomplete_attribute = "section-billing cc-name";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "ccnumber", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("section-billing cc-number");
+  field.autocomplete_attribute = "section-billing cc-number";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "ccexp", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("section-billing cc-exp");
+  field.autocomplete_attribute = "section-billing cc-exp";
   form.fields.push_back(field);
 
   autofill_test::CreateTestFormField("", "email", "", "text", &field);
-  field.autocomplete_type = ASCIIToUTF16("email");
+  field.autocomplete_attribute = "email";
   form.fields.push_back(field);
 
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
   // Fill the unnamed section.
   GUIDPair guid("00000000-0000-0000-0000-000000000001", 0);
   GUIDPair empty(std::string(), 0);
   FillAutofillFormData(kDefaultPageID, form, form.fields[1],
                        PackGUIDs(empty, guid));
@@ skipping 246 matching lines @@
   form_with_maxlength.origin = GURL("http://myform.com/phone_form.html");
   form_with_maxlength.action = GURL("http://myform.com/phone_submit.html");
   form_with_maxlength.user_submitted = true;
   FormData form_with_autocompletetype = form_with_maxlength;
   form_with_autocompletetype.name = ASCIIToUTF16("MyAutocompletetypePhoneForm");
 
   struct {
     const char* label;
     const char* name;
     size_t max_length;
-    const char* autocomplete_type;
+    const char* autocomplete_attribute;
   } test_fields[] = {
-    { "country code", "country_code", 1, "phone-country-code" },
-    { "area code", "area_code", 3, "phone-area-code" },
-    { "phone", "phone_prefix", 3, "phone-local-prefix" },
-    { "-", "phone_suffix", 4, "phone-local-suffix" },
-    { "Phone Extension", "ext", 3, "phone-extension" }
+    { "country code", "country_code", 1, "tel-country-code" },
+    { "area code", "area_code", 3, "tel-area-code" },
+    { "phone", "phone_prefix", 3, "tel-local-prefix" },
+    { "-", "phone_suffix", 4, "tel-local-suffix" },
+    { "Phone Extension", "ext", 3, "tel-extension" }
   };
 
   FormFieldData field;
   const size_t default_max_length = field.max_length;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_fields); ++i) {
     autofill_test::CreateTestFormField(
         test_fields[i].label, test_fields[i].name, "", "text", &field);
     field.max_length = test_fields[i].max_length;
-    field.autocomplete_type = string16();
+    field.autocomplete_attribute = std::string();
     form_with_maxlength.fields.push_back(field);
 
     field.max_length = default_max_length;
-    field.autocomplete_type = ASCIIToUTF16(test_fields[i].autocomplete_type);
+    field.autocomplete_attribute = test_fields[i].autocomplete_attribute;
     form_with_autocompletetype.fields.push_back(field);
   }
 
   std::vector<FormData> forms;
   forms.push_back(form_with_maxlength);
   forms.push_back(form_with_autocompletetype);
   FormsSeen(forms);
 
   // We should be able to fill prefix and suffix fields for US numbers.
   AutofillProfile* work_profile = autofill_manager_->GetProfileWithGUID(
@@ skipping 249 matching lines @@
 // values.
 TEST_F(AutofillManagerTest, FormSubmittedWithDefaultValues) {
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
   form.fields[3].value = ASCIIToUTF16("Enter your address");
 
   // Convert the state field to a <select> popup, to make sure that we only
   // reject default values for text fields.
   ASSERT_TRUE(form.fields[6].name == ASCIIToUTF16("state"));
-  form.fields[6].form_control_type = ASCIIToUTF16("select-one");
+  form.fields[6].form_control_type = "select-one";
   form.fields[6].value = ASCIIToUTF16("Tennessee");
 
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
   // Fill the form.
   GUIDPair guid("00000000-0000-0000-0000-000000000001", 0);
   GUIDPair empty(std::string(), 0);
   FillAutofillFormData(kDefaultPageID, form, form.fields[3],
                        PackGUIDs(empty, guid));
@@ skipping 529 matching lines @@
   AutofillManager* autofill_manager =
       AutofillManager::FromWebContents(contents);
   EXPECT_TRUE(autofill_manager->external_delegate());
 
   AutocompleteHistoryManager* autocomplete_history_manager =
       AutocompleteHistoryManager::FromWebContents(contents);
   EXPECT_TRUE(autocomplete_history_manager->external_delegate());
 }
 
 #endif  // OS_ANDROID