[Autofill] Distinguish between native field types and potentially HTML field types.

components/autofill/content/browser/autocheckout_manager_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 <map>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/tuple.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "components/autofill/content/browser/autocheckout_manager.h"
@@ skipping 38 matching lines @@
   field.autocomplete_attribute = autocomplete_attribute;
   field.form_control_type = "text";
   return field;
 }
 
 FormFieldData BuildField(const std::string& autocomplete_attribute) {
   return BuildFieldWithValue(autocomplete_attribute, autocomplete_attribute);
 }
 
 scoped_ptr<FormStructure> CreateTestFormStructure(
-    const std::vector<AutofillFieldType>& autofill_types) {
+    const std::vector<ServerFieldType>& autofill_types) {
   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;
 
   // Add some fields, autocomplete_attribute is not important and we
   // fake that server sends authoritative field mappings.
   for (size_t i = 0; i < autofill_types.size(); ++i)
     form.fields.push_back(BuildField("SomeField"));
 
   scoped_ptr<FormStructure> form_structure(
       new FormStructure(form, std::string()));
 
   // Set mocked Autofill server field types.
   for (size_t i = 0; i < autofill_types.size(); ++i) {
     form_structure->field(i)->set_server_type(autofill_types[i]);
     // Set heuristic type to make sure that server_types are used and not
     // heuritic type.
     form_structure->field(i)->set_heuristic_type(CREDIT_CARD_NUMBER);
   }
 
   return form_structure.Pass();
 }
 
 scoped_ptr<FormStructure> CreateTestAddressFormStructure() {
-  std::vector<AutofillFieldType> autofill_types;
+  std::vector<ServerFieldType> autofill_types;
   autofill_types.push_back(NAME_FULL);
   autofill_types.push_back(PHONE_HOME_WHOLE_NUMBER);
   autofill_types.push_back(EMAIL_ADDRESS);
   autofill_types.push_back(ADDRESS_HOME_LINE1);
   autofill_types.push_back(ADDRESS_HOME_CITY);
   autofill_types.push_back(ADDRESS_HOME_STATE);
   autofill_types.push_back(ADDRESS_HOME_COUNTRY);
   autofill_types.push_back(ADDRESS_HOME_ZIP);
   autofill_types.push_back(NO_SERVER_DATA);
   return CreateTestFormStructure(autofill_types);
 }
 
 scoped_ptr<FormStructure> CreateTestCreditCardFormStructure() {
-  std::vector<AutofillFieldType> autofill_types;
+  std::vector<ServerFieldType> autofill_types;
   autofill_types.push_back(CREDIT_CARD_NAME);
   autofill_types.push_back(CREDIT_CARD_NUMBER);
   autofill_types.push_back(CREDIT_CARD_EXP_MONTH);
   autofill_types.push_back(CREDIT_CARD_EXP_4_DIGIT_YEAR);
   autofill_types.push_back(CREDIT_CARD_VERIFICATION_CODE);
   autofill_types.push_back(ADDRESS_BILLING_LINE1);
   autofill_types.push_back(ADDRESS_BILLING_CITY);
   autofill_types.push_back(ADDRESS_BILLING_STATE);
   autofill_types.push_back(ADDRESS_BILLING_COUNTRY);
   autofill_types.push_back(ADDRESS_BILLING_ZIP);
@@ skipping 110 matching lines @@
   PopulateClickElement(&element, "#before_form_fill_2");
   metadata->click_elements_before_form_fill.push_back(element);
   PopulateClickElement(&element, "#after_form_fill");
   metadata->click_elements_after_form_fill.push_back(element);
   return metadata.Pass();
 }
 
 struct TestField {
   const char* const field_type;
   const char* const field_value;
-  AutofillFieldType autofill_type;
+  ServerFieldType autofill_type;
 };
 
 const TestField kTestFields[] = {
   {"name", "Test User", NAME_FULL},
   {"tel", "650-123-9909", PHONE_HOME_WHOLE_NUMBER},
   {"email", "blah@blah.com", EMAIL_ADDRESS},
   {"cc-name", "Test User", CREDIT_CARD_NAME},
   {"cc-number", "4444444444444448", CREDIT_CARD_NUMBER},
   {"cc-exp-month", "10", CREDIT_CARD_EXP_MONTH},
   {"cc-exp-year", "2020", CREDIT_CARD_EXP_4_DIGIT_YEAR},
@@ skipping 696 matching lines @@
       frame_url,
       AUTOCHECKOUT_BUBBLE_CANCELED);
   EXPECT_FALSE(autocheckout_manager_->is_autocheckout_bubble_showing());
   EXPECT_FALSE(autocheckout_manager_->should_show_bubble());
 
   autocheckout_manager_->MaybeShowAutocheckoutBubble(frame_url, bounding_box);
   EXPECT_FALSE(autocheckout_manager_->is_autocheckout_bubble_showing());
 }
 
 }  // namespace autofill