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

components/autofill/core/browser/autofill_profile_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 "base/basictypes.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_common_test.h"
 #include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/component_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 
 namespace {
 
 bool UpdateProfileLabel(AutofillProfile *profile) {
   std::vector<AutofillProfile*> profiles;
@@ skipping 312 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."), labels[1]);
 
   // Three fields at least - no filter.
   AutofillProfile::CreateInferredLabels(&profiles.get(), NULL, UNKNOWN_TYPE, 3,
                                         &labels);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., Elysium"),
             labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore., Dis"),
             labels[1]);
 
-  std::vector<AutofillFieldType> suggested_fields;
+  std::vector<ServerFieldType> suggested_fields;
   suggested_fields.push_back(ADDRESS_HOME_CITY);
   suggested_fields.push_back(ADDRESS_HOME_STATE);
   suggested_fields.push_back(ADDRESS_HOME_ZIP);
 
   // Two fields at least, from suggested fields - no filter.
   AutofillProfile::CreateInferredLabels(&profiles.get(), &suggested_fields,
                                         UNKNOWN_TYPE, 2, &labels);
   EXPECT_EQ(ASCIIToUTF16("Elysium, CA"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Dis, CA"), labels[1]);
 
@@ skipping 57 matching lines @@
                        "John", "", "Doe", "doe@example.com", "",
                        "88 Nowhere Ave.", "", "", "", "", "", "");
   profiles.push_back(
       new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
   test::SetProfileInfo(profiles[1],
                        "Johnny", "K", "Doe", "doe@example.com", "",
                        "88 Nowhere Ave.", "", "", "", "", "", "");
 
   // If the only name field in the suggested fields is the excluded field, we
   // should not fall back to the full name as a distinguishing field.
-  std::vector<AutofillFieldType> suggested_fields;
+  std::vector<ServerFieldType> suggested_fields;
   suggested_fields.push_back(NAME_LAST);
   suggested_fields.push_back(ADDRESS_HOME_LINE1);
   suggested_fields.push_back(EMAIL_ADDRESS);
   std::vector<base::string16> labels;
   AutofillProfile::CreateInferredLabels(&profiles.get(), &suggested_fields,
                                         NAME_LAST, 1, &labels);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave."), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave."), labels[1]);
 
@@ skipping 15 matching lines @@
                        "John", "", "Doe", "doe@example.com", "",
                        "88 Nowhere Ave.", "", "", "", "", "", "");
   profiles.push_back(
       new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
   test::SetProfileInfo(profiles[1],
                        "John", "", "Doe", "dojo@example.com", "",
                        "88 Nowhere Ave.", "", "", "", "", "", "");
 
   // If the only name field in the suggested fields is the excluded field, we
   // should not fall back to the full name as a distinguishing field.
-  std::vector<AutofillFieldType> suggested_fields;
+  std::vector<ServerFieldType> suggested_fields;
   suggested_fields.push_back(ADDRESS_HOME_LINE1);
   suggested_fields.push_back(ADDRESS_BILLING_LINE1);
   suggested_fields.push_back(EMAIL_ADDRESS);
   std::vector<base::string16> labels;
   AutofillProfile::CreateInferredLabels(&profiles.get(), &suggested_fields,
                                         UNKNOWN_TYPE, 2, &labels);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave., doe@example.com"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave., dojo@example.com"), labels[1]);
 }
@@ skipping 308 matching lines @@
     options[i] = ASCIIToUTF16(kCountries[i]);
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = options;
   field.option_contents = options;
 
   AutofillProfile profile(base::GenerateGUID(), "https://www.example.com/");
   profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("CA"));
-  profile.FillSelectControl(ADDRESS_HOME_COUNTRY, "en-US", &field);
+  profile.FillSelectControl(
+      AutofillType(ADDRESS_HOME_COUNTRY), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("Canada"), field.value);
 }
 
 TEST(AutofillProfileTest, AddressCountryAbbrev) {
   const char* const kCountries[] = {
     "AL", "CA"
   };
   std::vector<base::string16> options(arraysize(kCountries));
   for (size_t i = 0; i < arraysize(kCountries); ++i) {
     options[i] = ASCIIToUTF16(kCountries[i]);
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = options;
   field.option_contents = options;
 
   AutofillProfile profile(base::GenerateGUID(), "https://www.example.com/");
   profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("CA"));
-  profile.FillSelectControl(ADDRESS_HOME_COUNTRY, "en-US", &field);
+  profile.FillSelectControl(
+      AutofillType(ADDRESS_HOME_COUNTRY), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("CA"), field.value);
 }
 
 TEST(AutofillProfileTest, AddressStateFull) {
   const char* const kStates[] = {
     "Alabama", "California"
   };
   std::vector<base::string16> options(arraysize(kStates));
   for (size_t i = 0; i < arraysize(kStates); ++i) {
     options[i] = ASCIIToUTF16(kStates[i]);
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = options;
   field.option_contents = options;
 
   AutofillProfile profile(base::GenerateGUID(), "https://www.example.com/");
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
-  profile.FillSelectControl(ADDRESS_HOME_STATE, "en-US", &field);
+  profile.FillSelectControl(AutofillType(ADDRESS_HOME_STATE), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("California"), field.value);
 }
 
 TEST(AutofillProfileTest, AddressStateAbbrev) {
   const char* const kStates[] = {
     "AL", "CA"
   };
   std::vector<base::string16> options(arraysize(kStates));
   for (size_t i = 0; i < arraysize(kStates); ++i) {
     options[i] = ASCIIToUTF16(kStates[i]);
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = options;
   field.option_contents = options;
 
   AutofillProfile profile(base::GenerateGUID(), "https://www.example.com/");
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("California"));
-  profile.FillSelectControl(ADDRESS_HOME_STATE, "en-US", &field);
+  profile.FillSelectControl(AutofillType(ADDRESS_HOME_STATE), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("CA"), field.value);
 }
 
 TEST(AutofillProfileTest, FillByValue) {
   const char* const kStates[] = {
     "Alabama", "California"
   };
   std::vector<base::string16> values(arraysize(kStates));
   std::vector<base::string16> contents(arraysize(kStates));
   for (unsigned int i = 0; i < arraysize(kStates); ++i) {
     values[i] = ASCIIToUTF16(kStates[i]);
     contents[i] = ASCIIToUTF16(base::StringPrintf("%u", i));
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = values;
   field.option_contents = contents;
 
   AutofillProfile profile(base::GenerateGUID(), "https://www.example.com/");
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("California"));
-  profile.FillSelectControl(ADDRESS_HOME_STATE, "en-US", &field);
+  profile.FillSelectControl(AutofillType(ADDRESS_HOME_STATE), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("California"), field.value);
 }
 
 TEST(AutofillProfileTest, FillByContents) {
   const char* const kStates[] = {
     "Alabama", "California"
   };
   std::vector<base::string16> values(arraysize(kStates));
   std::vector<base::string16> contents(arraysize(kStates));
   for (unsigned int i = 0; i < arraysize(kStates); ++i) {
     values[i] = ASCIIToUTF16(base::StringPrintf("%u", i + 1));
     contents[i] = ASCIIToUTF16(kStates[i]);
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = values;
   field.option_contents = contents;
 
   AutofillProfile profile(base::GenerateGUID(), "https://www.example.com/");
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("California"));
-  profile.FillSelectControl(ADDRESS_HOME_STATE, "en-US", &field);
+  profile.FillSelectControl(AutofillType(ADDRESS_HOME_STATE), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("2"), field.value);
 }
 
 TEST(AutofillProfileTest, IsPresentButInvalid) {
   AutofillProfile profile(base::GenerateGUID(), "https://www.example.com/");
   EXPECT_FALSE(profile.IsPresentButInvalid(ADDRESS_HOME_STATE));
   EXPECT_FALSE(profile.IsPresentButInvalid(ADDRESS_HOME_ZIP));
   EXPECT_FALSE(profile.IsPresentButInvalid(PHONE_HOME_WHOLE_NUMBER));
 
   profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"));
@@ skipping 14 matching lines @@
   EXPECT_FALSE(profile.IsPresentButInvalid(ADDRESS_HOME_ZIP));
 
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("310"));
   EXPECT_TRUE(profile.IsPresentButInvalid(PHONE_HOME_WHOLE_NUMBER));
 
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("(310) 310-6000"));
   EXPECT_FALSE(profile.IsPresentButInvalid(PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill