[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..433a40ffcc35ea325eddf1add29212db21b01549 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", "Master card", "AmEx",
                                                "discover"};
   AutofillField field;
   test::CreateTestSelectField(kCreditCardTypes, &field);
@@ -812,8 +812,8 @@ TEST_F(AutofillFieldTest, FillSelectControlWithCreditCardType) {
 
   // Filling should be able to handle intervening whitespace:
   AutofillField::FillFormField(
-      field, ASCIIToUTF16("MasterCard"), "en-US", "en-US", &field);
-  EXPECT_EQ(ASCIIToUTF16("Master Card"), field.value);
+      field, ASCIIToUTF16("Mastercard"), "en-US", "en-US", &field);

[Mathieu, 2017/04/23 08:23:48]

Could we add cases for variations of Mastercard such as MasterCard, Master Card?

[Jared Saul, 2017/04/24 17:41:08]

I was under the impression while reviewing that the "Case insensitivity:
Discover vs. discover" test below accounted for that.  These tests don't seem
linked to the card types themselves but rather just using them for
spacing/capitalization unit tests?

[jiahuiguo, 2017/04/25 20:20:32]

Done.

+  EXPECT_EQ(ASCIIToUTF16("Master card"), field.value);
 
   // American Express is sometimes abbreviated as AmEx:
   AutofillField::FillFormField(