Index: components/autofill/core/browser/autofill_manager_unittest.cc |
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc |
index e9d94a48d4007bdfa171308b4ec47b95e6fa3aa5..72efc9f1a681c4d1da24570341237f2e1eae8968 100644 |
--- a/components/autofill/core/browser/autofill_manager_unittest.cc |
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc |
@@ -1554,7 +1554,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_EmptyValue) { |
kDefaultPageID, Suggestion("Visa" + kUTF8MidlineEllipsis + "3456", |
"04/99", kVisaCard, |
autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "8765", "10/98", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "8765", "10/98", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1576,7 +1576,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_Whitespace) { |
kDefaultPageID, Suggestion("Visa" + kUTF8MidlineEllipsis + "3456", |
"04/99", kVisaCard, |
autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "8765", "10/98", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "8765", "10/98", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1598,7 +1598,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_StopCharsOnly) { |
kDefaultPageID, Suggestion("Visa" + kUTF8MidlineEllipsis + "3456", |
"04/99", kVisaCard, |
autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "8765", "10/98", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "8765", "10/98", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1626,7 +1626,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_StopCharsWithInput) { |
// Test that we sent the right value to the external delegate. |
external_delegate_->CheckSuggestions( |
- kDefaultPageID, Suggestion("MasterCard" + kUTF8MidlineEllipsis + "3123", |
+ kDefaultPageID, Suggestion("Mastercard" + kUTF8MidlineEllipsis + "3123", |
"08/17", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(7))); |
} |
@@ -1667,7 +1667,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_NonCCNumber) { |
static const std::string kVisaSuggestion = |
"Visa" + kUTF8MidlineEllipsis + "3456"; |
static const std::string kMcSuggestion = |
- "MasterCard" + kUTF8MidlineEllipsis + "8765"; |
+ "Mastercard" + kUTF8MidlineEllipsis + "8765"; |
#else |
static const std::string kVisaSuggestion = "*3456"; |
static const std::string kMcSuggestion = "*8765"; |
@@ -1770,7 +1770,7 @@ TEST_F(AutofillManagerTest, |
kDefaultPageID, Suggestion("Visa" + kUTF8MidlineEllipsis + "3456", |
"04/99", kVisaCard, |
autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "8765", "10/98", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "8765", "10/98", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1855,7 +1855,7 @@ TEST_F(AutofillManagerTest, |
kDefaultPageID, Suggestion("Visa" + kUTF8MidlineEllipsis + "3456", |
"04/99", kVisaCard, |
autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "8765", "10/98", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "8765", "10/98", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1879,7 +1879,7 @@ TEST_F(AutofillManagerTest, |
kDefaultPageID, Suggestion("Visa" + kUTF8MidlineEllipsis + "3456", |
"04/99", kVisaCard, |
autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "8765", "10/98", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "8765", "10/98", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1910,9 +1910,9 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_RepeatedObfuscatedNumber) { |
kDefaultPageID, Suggestion("Visa" + kUTF8MidlineEllipsis + "3456", |
"04/99", kVisaCard, |
autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "8765", "10/98", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "8765", "10/98", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(5)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "3456", "05/99", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "3456", "05/99", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(7))); |
} |
@@ -1942,7 +1942,7 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestions) { |
kPageID2, Suggestion("Visa" + kUTF8MidlineEllipsis + "3456", |
"04/99", kVisaCard, |
autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion("MasterCard" + kUTF8MidlineEllipsis + "8765", "10/98", |
+ Suggestion("Mastercard" + kUTF8MidlineEllipsis + "8765", "10/98", |
kMasterCard, autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -2648,7 +2648,7 @@ TEST_F(AutofillManagerTest, FillCreditCardForm_ExpiredCard) { |
test::CreateTestFormField("Name on Card", "nameoncard", "", "text", &field); |
field.autocomplete_attribute = "cc-name"; |
form.fields.push_back(field); |
- std::vector<const char*> kCreditCardTypes = {"Visa", "Master Card", "AmEx", |
+ std::vector<const char*> kCreditCardTypes = {"Visa", "Mastercard", "AmEx", |
Jared Saul
2017/04/18 18:24:19
Should this stay "Master card"? Looks like "disco
jiahuiguo
2017/04/18 20:58:51
Done.
|
"discover"}; |
test::CreateTestSelectField("Card Type", "cardtype", "", kCreditCardTypes, |
kCreditCardTypes, 4, &field); |