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

components/autofill/core/browser/credit_card_unittest.cc

Index: components/autofill/core/browser/credit_card_unittest.cc
diff --git a/components/autofill/core/browser/credit_card_unittest.cc b/components/autofill/core/browser/credit_card_unittest.cc
index c8b77bf50b9b195fe659b77a85bc00dada9fe288..837d729f9790dc64a87a198c8629fd1d933d19e9 100644
--- a/components/autofill/core/browser/credit_card_unittest.cc
+++ b/components/autofill/core/browser/credit_card_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
@@ -327,11 +328,13 @@ TEST(CreditCardTest, SetExpirationMonth) {
   EXPECT_EQ(ASCIIToUTF16("07"), card.GetRawInfo(CREDIT_CARD_EXP_MONTH));
   EXPECT_EQ(7, card.expiration_month());
 
-  card.SetInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("January"), "en-US");
+  card.SetInfo(
+      AutofillType(CREDIT_CARD_EXP_MONTH), ASCIIToUTF16("January"), "en-US");
   EXPECT_EQ(ASCIIToUTF16("01"), card.GetRawInfo(CREDIT_CARD_EXP_MONTH));
   EXPECT_EQ(1, card.expiration_month());
 
-  card.SetInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("Apr"), "en-US");
+  card.SetInfo(
+      AutofillType(CREDIT_CARD_EXP_MONTH), ASCIIToUTF16("Apr"), "en-US");
   EXPECT_EQ(ASCIIToUTF16("04"), card.GetRawInfo(CREDIT_CARD_EXP_MONTH));
   EXPECT_EQ(4, card.expiration_month());
 }
@@ -373,7 +376,8 @@ TEST(CreditCardTest, CreditCardMonthExact) {
 
   CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
   credit_card.SetRawInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("01"));
-  credit_card.FillSelectControl(CREDIT_CARD_EXP_MONTH, "en-US", &field);
+  credit_card.FillSelectControl(
+      AutofillType(CREDIT_CARD_EXP_MONTH), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("01"), field.value);
 }
 
@@ -394,7 +398,8 @@ TEST(CreditCardTest, CreditCardMonthAbbreviated) {
 
   CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
   credit_card.SetRawInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("01"));
-  credit_card.FillSelectControl(CREDIT_CARD_EXP_MONTH, "en-US", &field);
+  credit_card.FillSelectControl(
+      AutofillType(CREDIT_CARD_EXP_MONTH), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("Jan"), field.value);
 }
 
@@ -415,7 +420,8 @@ TEST(CreditCardTest, CreditCardMonthFull) {
 
   CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
   credit_card.SetRawInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("01"));
-  credit_card.FillSelectControl(CREDIT_CARD_EXP_MONTH, "en-US", &field);
+  credit_card.FillSelectControl(
+      AutofillType(CREDIT_CARD_EXP_MONTH), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("January"), field.value);
 }
 
@@ -435,7 +441,8 @@ TEST(CreditCardTest, CreditCardMonthNumeric) {
 
   CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
   credit_card.SetRawInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("01"));
-  credit_card.FillSelectControl(CREDIT_CARD_EXP_MONTH, "en-US", &field);
+  credit_card.FillSelectControl(
+      AutofillType(CREDIT_CARD_EXP_MONTH), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("1"), field.value);
 }
 
@@ -455,7 +462,8 @@ TEST(CreditCardTest, CreditCardTwoDigitYear) {
 
   CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
   credit_card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("2017"));
-  credit_card.FillSelectControl(CREDIT_CARD_EXP_4_DIGIT_YEAR, "en-US", &field);
+  credit_card.FillSelectControl(
+      AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("17"), field.value);
   EXPECT_EQ(2017, credit_card.expiration_year());
 }
@@ -483,7 +491,8 @@ TEST(CreditCardTest, CreditCardTypeSelectControl) {
     CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
     credit_card.SetRawInfo(CREDIT_CARD_NUMBER,
                            ASCIIToUTF16("4111111111111111"));
-    credit_card.FillSelectControl(CREDIT_CARD_TYPE, "en-US", &field);
+    credit_card.FillSelectControl(
+        AutofillType(CREDIT_CARD_TYPE), "en-US", &field);
     EXPECT_EQ(ASCIIToUTF16("Visa"), field.value);
   }
 
@@ -492,7 +501,8 @@ TEST(CreditCardTest, CreditCardTypeSelectControl) {
     CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
     credit_card.SetRawInfo(CREDIT_CARD_NUMBER,
                            ASCIIToUTF16("5105105105105100"));
-    credit_card.FillSelectControl(CREDIT_CARD_TYPE, "en-US", &field);
+    credit_card.FillSelectControl(
+        AutofillType(CREDIT_CARD_TYPE), "en-US", &field);
     EXPECT_EQ(ASCIIToUTF16("Master Card"), field.value);
   }
 
@@ -500,7 +510,8 @@ TEST(CreditCardTest, CreditCardTypeSelectControl) {
     // American Express is sometimes abbreviated as AmEx:
     CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
     credit_card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("371449635398431"));
-    credit_card.FillSelectControl(CREDIT_CARD_TYPE, "en-US", &field);
+    credit_card.FillSelectControl(
+        AutofillType(CREDIT_CARD_TYPE), "en-US", &field);
     EXPECT_EQ(ASCIIToUTF16("AmEx"), field.value);
   }
 
@@ -509,7 +520,8 @@ TEST(CreditCardTest, CreditCardTypeSelectControl) {
     CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
     credit_card.SetRawInfo(CREDIT_CARD_NUMBER,
                            ASCIIToUTF16("6011111111111117"));
-    credit_card.FillSelectControl(CREDIT_CARD_TYPE, "en-US", &field);
+    credit_card.FillSelectControl(
+        AutofillType(CREDIT_CARD_TYPE), "en-US", &field);
     EXPECT_EQ(ASCIIToUTF16("discover"), field.value);
   }
 }