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 f1307e51193e67fbcf8c43add254d74f3bb571a2..a112c8a7428f20d315687d4e6a98946bc676ba67 100644 |
--- a/components/autofill/core/browser/autofill_manager_unittest.cc |
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc |
@@ -1619,7 +1619,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_EmptyValue) { |
kDefaultPageID, |
Suggestion(std::string("Visa") + kUTF8MidlineEllipsis + "3456", "04/99", |
kVisaCard, autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "8765", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "8765", |
"10/98", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1642,7 +1642,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_Whitespace) { |
kDefaultPageID, |
Suggestion(std::string("Visa") + kUTF8MidlineEllipsis + "3456", "04/99", |
kVisaCard, autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "8765", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "8765", |
"10/98", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1665,7 +1665,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_StopCharsOnly) { |
kDefaultPageID, |
Suggestion(std::string("Visa") + kUTF8MidlineEllipsis + "3456", "04/99", |
kVisaCard, autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "8765", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "8765", |
"10/98", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1695,7 +1695,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_StopCharsWithInput) { |
// Test that we sent the right value to the external delegate. |
external_delegate_->CheckSuggestions( |
kDefaultPageID, |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "3123", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "3123", |
"08/17", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(7))); |
} |
@@ -1736,7 +1736,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_NonCCNumber) { |
static const std::string kVisaSuggestion = |
std::string("Visa") + kUTF8MidlineEllipsis + "3456"; |
static const std::string kMcSuggestion = |
- std::string("MasterCard") + kUTF8MidlineEllipsis + "8765"; |
+ std::string("Mastercard") + kUTF8MidlineEllipsis + "8765"; |
#else |
static const std::string kVisaSuggestion = "*3456"; |
static const std::string kMcSuggestion = "*8765"; |
@@ -1838,7 +1838,7 @@ TEST_F(AutofillManagerTest, |
kDefaultPageID, |
Suggestion(std::string("Visa") + kUTF8MidlineEllipsis + "3456", "04/99", |
kVisaCard, autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "8765", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "8765", |
"10/98", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1923,7 +1923,7 @@ TEST_F(AutofillManagerTest, |
kDefaultPageID, |
Suggestion(std::string("Visa") + kUTF8MidlineEllipsis + "3456", "04/99", |
kVisaCard, autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "8765", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "8765", |
"10/98", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1948,7 +1948,7 @@ TEST_F(AutofillManagerTest, |
kDefaultPageID, |
Suggestion(std::string("Visa") + kUTF8MidlineEllipsis + "3456", "04/99", |
kVisaCard, autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "8765", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "8765", |
"10/98", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -1981,10 +1981,10 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestions_RepeatedObfuscatedNumber) { |
kDefaultPageID, |
Suggestion(std::string("Visa") + kUTF8MidlineEllipsis + "3456", "04/99", |
kVisaCard, autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "8765", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "8765", |
"10/98", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(5)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "3456", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "3456", |
"05/99", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(7))); |
} |
@@ -2015,7 +2015,7 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestions) { |
kPageID2, |
Suggestion(std::string("Visa") + kUTF8MidlineEllipsis + "3456", "04/99", |
kVisaCard, autofill_manager_->GetPackedCreditCardID(4)), |
- Suggestion(std::string("MasterCard") + kUTF8MidlineEllipsis + "8765", |
+ Suggestion(std::string("Mastercard") + kUTF8MidlineEllipsis + "8765", |
"10/98", kMasterCard, |
autofill_manager_->GetPackedCreditCardID(5))); |
} |
@@ -2716,7 +2716,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", |
"discover"}; |
test::CreateTestSelectField("Card Type", "cardtype", "", kCreditCardTypes, |
kCreditCardTypes, 4, &field); |