components/autofill/core/browser/personal_data_manager_unittest.cc - Issue 2849523003: Add billing address as a mandatory field of Payments credit cards.

Unified Diff: components/autofill/core/browser/personal_data_manager_unittest.cc

Issue 2849523003: Add billing address as a mandatory field of Payments credit cards. (Closed)

Patch Set: Added AddressComboboxModel unittests and fixed more compile issues. Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« components/autofill/core/browser/credit_card_unittest.cc ('K') | « components/autofill/core/browser/payments/full_card_request_unittest.cc ('k') | components/autofill/core/browser/validation.h » ('j') | components/autofill/core/browser/validation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/autofill/core/browser/personal_data_manager_unittest.cc

diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc

index 506530c81637113c885400fb160075666965d2fc..24deecfe3f80f30e06c1964be4616711ba0495ec 100644

--- a/components/autofill/core/browser/personal_data_manager_unittest.cc

+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc

@@ -210,8 +210,8 @@ class PersonalDataManagerTestBase {

CreditCard credit_card0("287151C8-6AB1-487C-9095-28E80BE5DA15",

"https://www.example.com");

test::SetCreditCardInfo(&credit_card0, "Clyde Barrow",

- "347666888555" /* American Express */, "04",

- "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

credit_card0.set_use_count(3);

credit_card0.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(1));

@@ -223,7 +223,7 @@ class PersonalDataManagerTestBase {

credit_card1.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(10));

test::SetCreditCardInfo(&credit_card1, "John Dillinger",

- "423456789012" /* Visa */, "01", "2999");

+ "423456789012" /* Visa */, "01", "2999", "1");

personal_data_->AddCreditCard(credit_card1);

CreditCard credit_card2("002149C1-EE28-4213-A3B9-DA243FFF021B",

@@ -232,7 +232,7 @@ class PersonalDataManagerTestBase {

credit_card2.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(1));

test::SetCreditCardInfo(&credit_card2, "Bonnie Parker",

- "518765432109" /* Mastercard */, "12", "2999");

+ "518765432109" /* Mastercard */, "12", "2999", "1");

personal_data_->AddCreditCard(credit_card2);

EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())

@@ -274,7 +274,7 @@ class PersonalDataManagerTestBase {

CreditCard expected(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected, exp_name, exp_cc_num, exp_cc_month,

- exp_cc_year);

+ exp_cc_year, "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected.Compare(*results[0]));

@@ -496,16 +496,17 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveProfiles) {

TEST_F(PersonalDataManagerTest, AddUpdateRemoveCreditCards) {

EnableWalletCardImport();

CreditCard credit_card0(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&credit_card0,

- "John Dillinger", "423456789012" /* Visa */, "01", "2999");

+ test::SetCreditCardInfo(&credit_card0, "John Dillinger",

+ "423456789012" /* Visa */, "01", "2999", "1");

CreditCard credit_card1(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card1, "Bonnie Parker",

- "518765432109" /* Mastercard */, "12", "2999");

+ "518765432109" /* Mastercard */, "12", "2999", "1");

CreditCard credit_card2(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card2, "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

// Add two test credit cards to the database.

personal_data_->AddCreditCard(credit_card0);

@@ -551,7 +552,7 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveCreditCards) {

// Add a full server card.

CreditCard credit_card3(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card3, "Jane Doe",

- "4111111111111111" /* Visa */, "04", "2999");

+ "4111111111111111" /* Visa */, "04", "2999", "1");

credit_card3.set_record_type(CreditCard::FULL_SERVER_CARD);

credit_card3.set_server_id("server_id");

@@ -591,7 +592,7 @@ TEST_F(PersonalDataManagerTest, AddCreditCard_BasicInformation) {

// Add a credit card to the database.

CreditCard credit_card(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card, "John Dillinger",

- "423456789012" /* Visa */, "01", "2999");

+ "423456789012" /* Visa */, "01", "2999", "1");

personal_data_->AddCreditCard(credit_card);

// Reload the database.

@@ -618,8 +619,8 @@ TEST_F(PersonalDataManagerTest, UpdateUnverifiedProfilesAndCreditCards) {

EXPECT_FALSE(profile.IsVerified());

CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");

- test::SetCreditCardInfo(&credit_card,

- "John Dillinger", "423456789012" /* Visa */, "01", "2999");

+ test::SetCreditCardInfo(&credit_card, "John Dillinger",

+ "423456789012" /* Visa */, "01", "2999", "1");

EXPECT_FALSE(credit_card.IsVerified());

// Add the data to the database.

@@ -701,7 +702,8 @@ TEST_F(PersonalDataManagerTest, RefuseToStoreFullCard) {

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));

test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

test::SetServerCreditCards(autofill_table_, server_cards);

personal_data_->Refresh();

@@ -729,7 +731,8 @@ TEST_F(PersonalDataManagerTest, AddFullCardAsMaskedCard) {

CreditCard server_card(CreditCard::FULL_SERVER_CARD, "c789");

test::SetCreditCardInfo(&server_card, "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())

.WillOnce(QuitMainMessageLoop());

@@ -760,17 +763,18 @@ TEST_F(PersonalDataManagerTest, UpdateServerCreditCards) {

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "9012" /* Visa */, "01", "2999");

+ "9012" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));

test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker",

- "2109" /* Mastercard */, "12", "2999");

+ "2109" /* Mastercard */, "12", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kMasterCard);

server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));

test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

test::SetServerCreditCards(autofill_table_, server_cards);

personal_data_->Refresh();

@@ -837,12 +841,12 @@ TEST_F(PersonalDataManagerTest, AddProfilesAndCreditCards) {

"US", "19482937549");

CreditCard credit_card0(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&credit_card0,

- "John Dillinger", "423456789012" /* Visa */, "01", "2999");

+ test::SetCreditCardInfo(&credit_card0, "John Dillinger",

+ "423456789012" /* Visa */, "01", "2999", "1");

CreditCard credit_card1(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card1, "Bonnie Parker",

- "518765432109" /* Mastercard */, "12", "2999");

+ "518765432109" /* Mastercard */, "12", "2999", "1");

// Add two test profiles to the database.

personal_data_->AddProfile(profile0);

@@ -980,7 +984,7 @@ TEST_F(PersonalDataManagerTest, SetEmptyProfile) {

TEST_F(PersonalDataManagerTest, SetEmptyCreditCard) {

CreditCard credit_card0(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&credit_card0, "", "", "", "");

+ test::SetCreditCardInfo(&credit_card0, "", "", "", "", "");

// Add the empty credit card to the database.

personal_data_->AddCreditCard(credit_card0);

@@ -2214,7 +2218,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_Valid) {

CreditCard expected(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",

- "2999");

+ "2999", "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected.Compare(*results[0]));

@@ -2275,7 +2279,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MonthSelectInvalidText) {

// See that the invalid option text was converted to the right value.

CreditCard expected(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "02",

- "2999");

+ "2999", "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected.Compare(*results[0]));

@@ -2301,7 +2305,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_TwoValidCards) {

CreditCard expected(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",

- "2999");

+ "2999", "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected.Compare(*results[0]));

@@ -2323,7 +2327,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_TwoValidCards) {

base::RunLoop().Run();

CreditCard expected2(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&expected2, "", "5500000000000004", "02", "2999");

+ test::SetCreditCardInfo(&expected2, "", "5500000000000004", "02", "2999",

+ "1");

std::vector<CreditCard*> cards;

cards.push_back(&expected);

cards.push_back(&expected2);

@@ -2414,7 +2419,7 @@ TEST_F(PersonalDataManagerTest,

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "1111" /* Visa */, "01", "2999");

+ "1111" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

test::SetServerCreditCards(autofill_table_, server_cards);

@@ -2446,7 +2451,8 @@ TEST_F(PersonalDataManagerTest,

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));

test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

test::SetServerCreditCards(autofill_table_, server_cards);

// Type the same data as the unmasked card into a form.

@@ -2482,7 +2488,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_SameCreditCardWithConflict) {

CreditCard expected(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",

- "2998");

+ "2998", "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected.Compare(*results[0]));

@@ -2508,7 +2514,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_SameCreditCardWithConflict) {

// updated to "2999".

CreditCard expected2(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",

- "2999");

+ "2999", "1");

const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results2.size());

EXPECT_EQ(0, expected2.Compare(*results2[0]));

@@ -2534,7 +2540,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_ShouldReturnLocalCard) {

CreditCard expected(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",

- "2998");

+ "2998", "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected.Compare(*results[0]));

@@ -2563,7 +2569,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_ShouldReturnLocalCard) {

// updated to "2999".

CreditCard expected2(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",

- "2999");

+ "2999", "1");

const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results2.size());

EXPECT_EQ(0, expected2.Compare(*results2[0]));

@@ -2589,7 +2595,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_EmptyCardWithConflict) {

CreditCard expected(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",

- "2998");

+ "2998", "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected.Compare(*results[0]));

@@ -2613,7 +2619,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_EmptyCardWithConflict) {

// No change is expected.

CreditCard expected2(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",

- "2998");

+ "2998", "1");

const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results2.size());

EXPECT_EQ(0, expected2.Compare(*results2[0]));

@@ -2638,8 +2644,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInNew) {

base::RunLoop().Run();

CreditCard expected(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&expected,

- "Biggie Smalls", "4111111111111111", "01", "2999");

+ test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",

+ "2999", "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected.Compare(*results[0]));

@@ -2662,8 +2668,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInNew) {

// No change is expected.

CreditCard expected2(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&expected2,

- "Biggie Smalls", "4111111111111111", "01", "2999");

+ test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",

+ "2999", "1");

const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results2.size());

EXPECT_EQ(0, expected2.Compare(*results2[0]));

@@ -2687,8 +2693,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInNew) {

// No change is expected.

CreditCard expected3(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&expected3,

- "Biggie Smalls", "4111111111111111", "01", "2999");

+ test::SetCreditCardInfo(&expected3, "Biggie Smalls", "4111111111111111", "01",

+ "2999", "1");

const std::vector<CreditCard*>& results3 = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results3.size());

EXPECT_EQ(0, expected3.Compare(*results3[0]));

@@ -2699,7 +2705,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInOld) {

// Note the empty name.

CreditCard saved_credit_card(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&saved_credit_card, "", "4111111111111111" /* Visa */,

- "01", "2998");

+ "01", "2998", "1");

personal_data_->AddCreditCard(saved_credit_card);

// Verify that the web database has been updated and the notification sent.

@@ -2732,7 +2738,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInOld) {

// added to the existing credit card.

CreditCard expected2(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",

- "2999");

+ "2999", "1");

const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results2.size());

EXPECT_EQ(0, expected2.Compare(*results2[0]));

@@ -2744,8 +2750,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_SameCardWithSeparators) {

// Start with a single valid credit card stored via the preferences.

// Note the separators in the credit card number.

CreditCard saved_credit_card(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&saved_credit_card,

- "Biggie Smalls", "4111 1111 1111 1111" /* Visa */, "01", "2999");

+ test::SetCreditCardInfo(&saved_credit_card, "Biggie Smalls",

+ "4111 1111 1111 1111" /* Visa */, "01", "2999", "1");

personal_data_->AddCreditCard(saved_credit_card);

// Verify that the web database has been updated and the notification sent.

@@ -2785,7 +2791,7 @@ TEST_F(PersonalDataManagerTest,

// Start with a verified credit card.

CreditCard credit_card(base::GenerateGUID(), kSettingsOrigin);

test::SetCreditCardInfo(&credit_card, "Biggie Smalls",

- "4111 1111 1111 1111" /* Visa */, "01", "2998");

+ "4111 1111 1111 1111" /* Visa */, "01", "2998", "1");

EXPECT_TRUE(credit_card.IsVerified());

// Add the credit card to the database.

@@ -2875,7 +2881,7 @@ TEST_F(PersonalDataManagerTest, ImportFormData_OneAddressOneCreditCard) {

// Test that the credit card has also been saved.

CreditCard expected_card(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected_card, "Biggie Smalls", "4111111111111111",

- "01", "2999");

+ "01", "2999", "1");

const std::vector<CreditCard*>& results_cards =

personal_data_->GetCreditCards();

ASSERT_EQ(1U, results_cards.size());

@@ -2946,7 +2952,7 @@ TEST_F(PersonalDataManagerTest, ImportFormData_TwoAddressesOneCreditCard) {

// Test that the credit card has been saved.

CreditCard expected_card(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&expected_card, "Biggie Smalls", "4111111111111111",

- "01", "2999");

+ "01", "2999", "1");

const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();

ASSERT_EQ(1U, results.size());

EXPECT_EQ(0, expected_card.Compare(*results[0]));

@@ -3001,8 +3007,8 @@ TEST_F(PersonalDataManagerTest, SaveImportedProfileWithVerifiedData) {

TEST_F(PersonalDataManagerTest, SaveImportedCreditCardWithVerifiedData) {

// Start with a verified credit card.

CreditCard credit_card(base::GenerateGUID(), kSettingsOrigin);

- test::SetCreditCardInfo(&credit_card,

- "Biggie Smalls", "4111 1111 1111 1111" /* Visa */, "01", "2999");

+ test::SetCreditCardInfo(&credit_card, "Biggie Smalls",

+ "4111 1111 1111 1111" /* Visa */, "01", "2999", "1");

EXPECT_TRUE(credit_card.IsVerified());

// Add the credit card to the database.

@@ -3116,9 +3122,8 @@ TEST_F(PersonalDataManagerTest, GetNonEmptyTypes) {

// Test with credit card information also stored.

CreditCard credit_card(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(&credit_card,

- "John Dillinger", "423456789012" /* Visa */,

- "01", "2999");

+ test::SetCreditCardInfo(&credit_card, "John Dillinger",

+ "423456789012" /* Visa */, "01", "2999", "1");

personal_data_->AddCreditCard(credit_card);

// Verify that the web database has been updated and the notification sent.

@@ -3170,8 +3175,8 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {

personal_data_->AddProfile(steve_jobs);

CreditCard bill_gates(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(

- &bill_gates, "William H. Gates", "5555555555554444", "1", "2020");

+ test::SetCreditCardInfo(&bill_gates, "William H. Gates", "5555555555554444",

+ "1", "2020", "1");

personal_data_->AddCreditCard(bill_gates);

// The personal data manager should be able to read existing profiles in an

@@ -3187,8 +3192,8 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {

personal_data_->AddProfile(test::GetFullProfile());

CreditCard larry_page(base::GenerateGUID(), "https://www.example.com");

- test::SetCreditCardInfo(

- &larry_page, "Lawrence Page", "4111111111111111", "10", "2025");

+ test::SetCreditCardInfo(&larry_page, "Lawrence Page", "4111111111111111",

+ "10", "2025", "1");

personal_data_->AddCreditCard(larry_page);

ResetPersonalDataManager(USER_MODE_INCOGNITO);

@@ -3548,7 +3553,7 @@ TEST_F(PersonalDataManagerTest,

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b459"));

test::SetCreditCardInfo(&server_cards.back(), "Emmet Dalton", "2110", "12",

- "2999");

+ "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

test::SetServerCreditCards(autofill_table_, server_cards);

@@ -3599,7 +3604,7 @@ TEST_F(PersonalDataManagerTest,

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b459"));

test::SetCreditCardInfo(&server_cards.back(), "Emmet Dalton", "2110", "12",

- "2999");

+ "2999", "1");

server_cards.back().set_use_count(2);

server_cards.back().set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(1));

@@ -3607,7 +3612,7 @@ TEST_F(PersonalDataManagerTest,

server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "b460"));

test::SetCreditCardInfo(&server_cards.back(), "Jesse James", "2109", "12",

- "2999");

+ "2999", "1");

server_cards.back().set_use_count(6);

server_cards.back().set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(1));

@@ -3641,14 +3646,15 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ExpiredCards) {

CreditCard credit_card0("002149C1-EE28-4213-A3B9-DA243FFF021B",

"https://www.example.com");

test::SetCreditCardInfo(&credit_card0, "Bonnie Parker",

- "518765432109" /* Mastercard */, "04", "2999");

+ "518765432109" /* Mastercard */, "04", "2999", "1");

personal_data_->AddCreditCard(credit_card0);

// Add an expired card with a higher frecency score.

CreditCard credit_card1("287151C8-6AB1-487C-9095-28E80BE5DA15",

"https://www.example.com");

test::SetCreditCardInfo(&credit_card1, "Clyde Barrow",

- "347666888555" /* American Express */, "04", "1999");

+ "347666888555" /* American Express */, "04", "1999",

+ "1");

credit_card1.set_use_count(300);

credit_card1.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(10));

@@ -3661,7 +3667,7 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ExpiredCards) {

credit_card2.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(1));

test::SetCreditCardInfo(&credit_card2, "John Dillinger",

- "423456789012" /* Visa */, "01", "1998");

+ "423456789012" /* Visa */, "01", "1998", "1");

personal_data_->AddCreditCard(credit_card2);

EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())

@@ -3693,7 +3699,8 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_NumberMissing) {

CreditCard credit_card0("287151C8-6AB1-487C-9095-28E80BE5DA15",

"https://www.example.com");

test::SetCreditCardInfo(&credit_card0, "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

credit_card0.set_use_count(3);

credit_card0.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(1));

@@ -3704,7 +3711,8 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_NumberMissing) {

credit_card1.set_use_count(300);

credit_card1.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(10));

- test::SetCreditCardInfo(&credit_card1, "John Dillinger", "", "01", "2999");

+ test::SetCreditCardInfo(&credit_card1, "John Dillinger", "", "01", "2999",

+ "1");

personal_data_->AddCreditCard(credit_card1);

EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())

@@ -3739,7 +3747,7 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ServerDuplicates) {

// suggestions since the locally saved card takes precedence.

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "9012" /* Visa */, "01", "2999");

+ "9012" /* Visa */, "01", "2999", "1");

server_cards.back().set_use_count(2);

server_cards.back().set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3749,7 +3757,7 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ServerDuplicates) {

// card type. Not a dupe and therefore both should appear in the suggestions.

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));

test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker", "2109", "12",

- "2999");

+ "2999", "1");

server_cards.back().set_use_count(3);

server_cards.back().set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3760,7 +3768,8 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ServerDuplicates) {

// precedence over local cards.

server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));

test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

server_cards.back().set_use_count(1);

server_cards.back().set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3810,7 +3819,8 @@ TEST_F(PersonalDataManagerTest,

// the local card should appear in the suggestions.

server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));

test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

test::SetServerCreditCards(autofill_table_, server_cards);

personal_data_->Refresh();

@@ -3828,7 +3838,7 @@ TEST_F(PersonalDataManagerTest,

// of more than one local card.

CreditCard credit_card3("4141084B-72D7-4B73-90CF-3D6AC154673B",

"https://www.example.com");

- test::SetCreditCardInfo(&credit_card3, "Clyde Barrow", "", "04", "");

+ test::SetCreditCardInfo(&credit_card3, "Clyde Barrow", "", "04", "", "");

personal_data_->AddCreditCard(credit_card3);

EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())

@@ -3851,7 +3861,7 @@ TEST_F(PersonalDataManagerTest,

CreditCard local_card("287151C8-6AB1-487C-9095-28E80BE5DA15",

"https://www.example.com");

test::SetCreditCardInfo(&local_card, "Homer Simpson",

- "423456789012" /* Visa */, "01", "2999");

+ "423456789012" /* Visa */, "01", "2999", "1");

local_card.set_use_count(3);

local_card.set_use_date(AutofillClock::Now() - base::TimeDelta::FromDays(1));

credit_cards.push_back(&local_card);

@@ -3859,7 +3869,7 @@ TEST_F(PersonalDataManagerTest,

// Create a full server card that is a duplicate of one of the local cards.

CreditCard full_server_card(CreditCard::FULL_SERVER_CARD, "c789");

test::SetCreditCardInfo(&full_server_card, "Homer Simpson",

- "423456789012" /* Visa */, "01", "2999");

+ "423456789012" /* Visa */, "01", "2999", "1");

full_server_card.set_use_count(1);

full_server_card.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3882,13 +3892,13 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_LocalShadowsMasked) {

local_card.set_use_count(300);

local_card.set_use_date(AutofillClock::Now() - base::TimeDelta::FromDays(10));

test::SetCreditCardInfo(&local_card, "Homer Simpson",

- "423456789012" /* Visa */, "01", "2999");

+ "423456789012" /* Visa */, "01", "2999", "1");

credit_cards.push_back(&local_card);

// Create a masked server card that is a duplicate of a local card.

CreditCard masked_card(CreditCard::MASKED_SERVER_CARD, "a123");

test::SetCreditCardInfo(&masked_card, "Homer Simpson", "9012" /* Visa */,

- "01", "2999");

+ "01", "2999", "1");

masked_card.set_use_count(2);

masked_card.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3909,7 +3919,7 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_FullServerAndMasked) {

// Create a full server card that is a duplicate of one of the local cards.

CreditCard full_server_card(CreditCard::FULL_SERVER_CARD, "c789");

test::SetCreditCardInfo(&full_server_card, "Homer Simpson",

- "423456789012" /* Visa */, "01", "2999");

+ "423456789012" /* Visa */, "01", "2999", "1");

full_server_card.set_use_count(1);

full_server_card.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3918,7 +3928,7 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_FullServerAndMasked) {

// Create a masked server card that is a duplicate of a local card.

CreditCard masked_card(CreditCard::MASKED_SERVER_CARD, "a123");

test::SetCreditCardInfo(&masked_card, "Homer Simpson", "9012" /* Visa */,

- "01", "2999");

+ "01", "2999", "1");

masked_card.set_use_count(2);

masked_card.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3940,12 +3950,13 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_DifferentCards) {

credit_card2.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(1));

test::SetCreditCardInfo(&credit_card2, "Homer Simpson",

- "518765432109" /* Mastercard */, "", "");

+ "518765432109" /* Mastercard */, "", "", "");

credit_cards.push_back(&credit_card2);

// Create a masked server card that is slightly different of the local card.

CreditCard credit_card4(CreditCard::MASKED_SERVER_CARD, "b456");

- test::SetCreditCardInfo(&credit_card4, "Homer Simpson", "2109", "12", "2999");

+ test::SetCreditCardInfo(&credit_card4, "Homer Simpson", "2109", "12", "2999",

+ "1");

credit_card4.set_use_count(3);

credit_card4.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3956,7 +3967,8 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_DifferentCards) {

// cards.

CreditCard credit_card5(CreditCard::FULL_SERVER_CARD, "c789");

test::SetCreditCardInfo(&credit_card5, "Homer Simpson",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

credit_card5.set_use_count(1);

credit_card5.set_use_date(AutofillClock::Now() -

base::TimeDelta::FromDays(15));

@@ -3979,7 +3991,7 @@ TEST_F(PersonalDataManagerTest, RecordUseOf) {

CreditCard credit_card(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card, "John Dillinger",

- "423456789012" /* Visa */, "01", "2999");

+ "423456789012" /* Visa */, "01", "2999", "1");

EXPECT_EQ(1U, credit_card.use_count());

EXPECT_EQ(kArbitraryTime, credit_card.use_date());

EXPECT_EQ(kArbitraryTime, credit_card.modification_date());

@@ -4035,17 +4047,18 @@ TEST_F(PersonalDataManagerTest, UpdateServerCreditCardUsageStats) {

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "9012" /* Visa */, "01", "2999");

+ "9012" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));

test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker",

- "4444" /* Mastercard */, "12", "2999");

+ "4444" /* Mastercard */, "12", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kMasterCard);

server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));

test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

// Create the test clock and set the time to a specific value.

TestAutofillClock test_clock;

@@ -4157,7 +4170,7 @@ TEST_F(PersonalDataManagerTest, ClearAllServerData) {

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "9012" /* Visa */, "01", "2999");

+ "9012" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

test::SetServerCreditCards(autofill_table_, server_cards);

personal_data_->Refresh();

@@ -4182,12 +4195,13 @@ TEST_F(PersonalDataManagerTest, DontDuplicateServerCard) {

std::vector<CreditCard> server_cards;

server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "1881" /* Visa */, "01", "2999");

+ "1881" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));

test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

test::SetServerCreditCards(autofill_table_, server_cards);

personal_data_->Refresh();

@@ -5028,17 +5042,18 @@ TEST_F(PersonalDataManagerTest,

// verifying results.

CreditCard credit_card1(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card1, "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

credit_card1.set_use_count(10);

CreditCard credit_card2(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card2, "John Dillinger",

- "423456789012" /* Visa */, "01", "2999");

+ "423456789012" /* Visa */, "01", "2999", "1");

credit_card2.set_use_count(5);

CreditCard credit_card3(base::GenerateGUID(), "https://www.example.com");

test::SetCreditCardInfo(&credit_card3, "Bonnie Parker",

- "518765432109" /* Mastercard */, "12", "2999");

+ "518765432109" /* Mastercard */, "12", "2999", "1");

credit_card3.set_use_count(1);

// Associate the first card with profile1.

@@ -5819,7 +5834,8 @@ TEST_F(PersonalDataManagerTest,

CreditCard local_card("287151C8-6AB1-487C-9095-28E80BE5DA15",

"https://www.example.com");

test::SetCreditCardInfo(&local_card, "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

local_card.set_billing_address_id(kServerAddressId);

personal_data_->AddCreditCard(local_card);

@@ -5827,7 +5843,7 @@ TEST_F(PersonalDataManagerTest,

server_cards.push_back(

CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card1"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "1111" /* Visa */, "01", "2999");

+ "1111" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

server_cards.back().set_billing_address_id(kServerAddressId);

test::SetServerCreditCards(autofill_table_, server_cards);

@@ -5927,7 +5943,8 @@ TEST_F(PersonalDataManagerTest,

CreditCard local_card("287151C8-6AB1-487C-9095-28E80BE5DA15",

"https://www.example.com");

test::SetCreditCardInfo(&local_card, "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

local_card.set_billing_address_id(kServerAddressId);

personal_data_->AddCreditCard(local_card);

@@ -5935,7 +5952,7 @@ TEST_F(PersonalDataManagerTest,

server_cards.push_back(

CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card1"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "1111" /* Visa */, "01", "2999");

+ "1111" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

server_cards.back().set_billing_address_id(kServerAddressId);

test::SetServerCreditCards(autofill_table_, server_cards);

@@ -6102,7 +6119,8 @@ TEST_F(

CreditCard local_card("287151C8-6AB1-487C-9095-28E80BE5DA15",

"https://www.example.com");

test::SetCreditCardInfo(&local_card, "Clyde Barrow",

- "347666888555" /* American Express */, "04", "2999");

+ "347666888555" /* American Express */, "04", "2999",

+ "1");

local_card.set_billing_address_id(kServerAddressId);

personal_data_->AddCreditCard(local_card);

@@ -6110,7 +6128,7 @@ TEST_F(

server_cards.push_back(

CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card1"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "1111" /* Visa */, "01", "2999");

+ "1111" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

server_cards.back().set_billing_address_id(kServerAddressId2);

test::SetServerCreditCards(autofill_table_, server_cards);

@@ -6207,7 +6225,7 @@ TEST_F(

server_cards.push_back(

CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card1"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "1111" /* Visa */, "01", "2999");

+ "1111" /* Visa */, "01", "2999", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

server_cards.back().set_billing_address_id(kServerAddressId);

test::SetServerCreditCards(autofill_table_, server_cards);

@@ -6245,7 +6263,7 @@ TEST_F(

server_cards.push_back(

CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card2"));

test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",

- "1112" /* Visa */, "01", "2888");

+ "1112" /* Visa */, "01", "2888", "1");

server_cards.back().SetNetworkForMaskedCard(kVisaCard);

server_cards.back().set_billing_address_id(kServerAddressId);

test::SetServerCreditCards(autofill_table_, server_cards);