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

components/autofill/core/browser/autofill_field_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 "components/autofill/core/browser/autofill_field.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 781 matching lines @@
   AutofillField field;
   test::CreateTestSelectField(kYears, &field);
   field.set_heuristic_type(CREDIT_CARD_EXP_2_DIGIT_YEAR);
 
   AutofillField::FillFormField(
       field, ASCIIToUTF16("2017"), "en-US", "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("17"), field.value);
 }
 
 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);
   field.set_heuristic_type(CREDIT_CARD_TYPE);
 
   // Normal case:
   AutofillField::FillFormField(
       field, ASCIIToUTF16("Visa"), "en-US", "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("Visa"), field.value);
 
   // 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(
       field, ASCIIToUTF16("American Express"), "en-US", "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("AmEx"), field.value);
 
   // Case insensitivity:
   AutofillField::FillFormField(
       field, ASCIIToUTF16("Discover"), "en-US", "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("discover"), field.value);
@@ skipping 254 matching lines @@
                               false},
         FillStateTextTestCase{HTML_TYPE_ADDRESS_LEVEL1, 1, "NY", "", false},
         // Filling a state to a text field with a maxlength value lower than the
         // value's length and that has no associated abbreviation should not
         // fill at all.
         FillStateTextTestCase{HTML_TYPE_ADDRESS_LEVEL1, 3, "Quebec", "",
                               false}));
 
 }  // namespace
 }  // namespace autofill