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

components/autofill/core/browser/credit_card_field.cc

Index: components/autofill/core/browser/credit_card_field.cc
diff --git a/components/autofill/core/browser/credit_card_field.cc b/components/autofill/core/browser/credit_card_field.cc
index 1f23137e4dfa45b6e79fcaefd9c688b7d125a59b..dac552d89532966258410614a9b9836778e078dd 100644
--- a/components/autofill/core/browser/credit_card_field.cc
+++ b/components/autofill/core/browser/credit_card_field.cc
@@ -126,7 +126,7 @@ std::unique_ptr<FormField> CreditCardField::Parse(AutofillScanner* scanner) {
       }
     }
 
-    // Check for a credit card type (Visa, MasterCard, etc.) field.
+    // Check for a credit card type (Visa, Mastercard, etc.) field.
     // All CC type fields encountered so far have been of type select.
     if (!credit_card_field->type_ && LikelyCardTypeSelectField(scanner)) {
       credit_card_field->type_ = scanner->Cursor();
@@ -312,7 +312,7 @@ bool CreditCardField::LikelyCardTypeSelectField(AutofillScanner* scanner) {
     return false;
 
   // We set |ignore_whitespace| to true on these calls because this is actually
-  // a pretty common mistake; e.g., "Master Card" instead of "MasterCard".
+  // a pretty common mistake; e.g., "Master Card" instead of "Mastercard".

[Jared Saul, 2017/04/18 01:21:57]

Missed a "Master Card" even though it looks like you're fixing them elsewhere. 
Maybe run a search for those too?

[jiahuiguo, 2017/04/18 17:58:04]

Done.

   bool isSelect = (AutofillField::FindShortestSubstringMatchInSelect(
                        l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_VISA), true,
                        field) >= 0) ||