[Autofill] Change MasterCard to Mastercard in UI and related tests

components/autofill/core/browser/autofill_field_unittest.cc

Index: components/autofill/core/browser/autofill_field_unittest.cc
diff --git a/components/autofill/core/browser/autofill_field_unittest.cc b/components/autofill/core/browser/autofill_field_unittest.cc
index 5731f376ace6dbe29a999cd1e5bc7b8ff3944ffe..ef6b2e87bea1ac7e3ef9fa64bde24ed648f0415f 100644
--- a/components/autofill/core/browser/autofill_field_unittest.cc
+++ b/components/autofill/core/browser/autofill_field_unittest.cc
@@ -799,7 +799,7 @@ TEST_F(AutofillFieldTest, FillSelectControlWithTwoDigitCreditCardYear) {
 }
 
 TEST_F(AutofillFieldTest, FillSelectControlWithCreditCardType) {
-  std::vector<const char*> kCreditCardTypes = {"Visa", "Master Card", "AmEx",
+  std::vector<const char*> kCreditCardTypes = {"Visa", "Mastercard", "AmEx",
                                                "discover"};
   AutofillField field;
   test::CreateTestSelectField(kCreditCardTypes, &field);
@@ -812,8 +812,17 @@ TEST_F(AutofillFieldTest, FillSelectControlWithCreditCardType) {
 
   // Filling should be able to handle intervening whitespace:
   AutofillField::FillFormField(
+      field, ASCIIToUTF16("Master card"), "en-US", "en-US", &field);
+  EXPECT_EQ(ASCIIToUTF16("Mastercard"), field.value);
+
+  // Mastercard is sometimes shown as MasterCard or Master Card:
+  AutofillField::FillFormField(
       field, ASCIIToUTF16("MasterCard"), "en-US", "en-US", &field);
-  EXPECT_EQ(ASCIIToUTF16("Master Card"), field.value);
+  EXPECT_EQ(ASCIIToUTF16("Mastercard"), field.value);
+
+  AutofillField::FillFormField(
+      field, ASCIIToUTF16("Master Card"), "en-US", "en-US", &field);
+  EXPECT_EQ(ASCIIToUTF16("Mastercard"), field.value);
 
   // American Express is sometimes abbreviated as AmEx:
   AutofillField::FillFormField(