Real autofill crash fix.
Make GetProfileByGUID work on all profiles (web as well as auxiliary).
BUG=161867
Review URL: https://codereview.chromium.org/11419168
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170230 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc
index 8f55535..d73ca36 100644
--- a/chrome/browser/autofill/personal_data_manager_unittest.cc
+++ b/chrome/browser/autofill/personal_data_manager_unittest.cc
@@ -120,7 +120,7 @@
ResetPersonalDataManager();
// Verify the addition.
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(0, profile0.Compare(*results1[0]));
@@ -133,7 +133,7 @@
ResetPersonalDataManager();
// Verify the non-addition.
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, profile0.Compare(*results2[0]));
@@ -151,7 +151,7 @@
ResetPersonalDataManager();
// Verify the addition.
- const std::vector<AutofillProfile*>& results3 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results3 = personal_data_->GetProfiles();
ASSERT_EQ(2U, results3.size());
EXPECT_EQ(0, profile0.Compare(*results3[0]));
EXPECT_EQ(0, profile1.Compare(*results3[1]));
@@ -185,7 +185,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(2U, results1.size());
EXPECT_EQ(0, profile0.Compare(*results1[0]));
EXPECT_EQ(0, profile1.Compare(*results1[1]));
@@ -201,7 +201,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
ASSERT_EQ(2U, results2.size());
EXPECT_EQ(0, profile0.Compare(*results2[0]));
EXPECT_EQ(0, profile2.Compare(*results2[1]));
@@ -212,7 +212,7 @@
ResetPersonalDataManager();
// Verify that we've loaded the profiles from the web database.
- const std::vector<AutofillProfile*>& results3 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results3 = personal_data_->GetProfiles();
ASSERT_EQ(2U, results3.size());
EXPECT_EQ(0, profile0.Compare(*results3[0]));
EXPECT_EQ(0, profile2.Compare(*results3[1]));
@@ -303,7 +303,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(2U, results1.size());
EXPECT_EQ(0, profile0.Compare(*results1[0]));
EXPECT_EQ(0, profile1.Compare(*results1[1]));
@@ -348,7 +348,7 @@
MessageLoop::current()->Run();
// Verify that we've loaded the profiles from the web database.
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, profile0.Compare(*results2[0]));
@@ -364,7 +364,7 @@
MessageLoop::current()->Run();
// Make sure the two profiles have different GUIDs, both valid.
- const std::vector<AutofillProfile*>& results3 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results3 = personal_data_->GetProfiles();
ASSERT_EQ(2U, results3.size());
EXPECT_NE(results3[0]->guid(), results3[1]->guid());
EXPECT_TRUE(base::IsValidGUID(results3[0]->guid()));
@@ -387,7 +387,7 @@
ResetPersonalDataManager();
// Verify that we've loaded the profiles from the web database.
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
ASSERT_EQ(0U, results2.size());
}
@@ -438,7 +438,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(2U, results1.size());
EXPECT_EQ(profile0, *results1[0]);
EXPECT_EQ(profile1, *results1[1]);
@@ -465,7 +465,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
ASSERT_EQ(3U, results2.size());
EXPECT_EQ(profile0, *results2[0]);
EXPECT_EQ(profile1, *results2[1]);
@@ -489,7 +489,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results3 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results3 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results3.size());
EXPECT_EQ(profile0, *results2[0]);
}
@@ -534,7 +534,7 @@
autofill_test::SetProfileInfo(&expected, "George", NULL,
"Washington", "[email protected]", NULL, "21 Laussat St", NULL,
"San Francisco", "California", "94102", NULL, NULL);
- const std::vector<AutofillProfile*>& results = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
}
@@ -570,7 +570,7 @@
&imported_credit_card));
ASSERT_EQ(static_cast<CreditCard*>(NULL), imported_credit_card);
- const std::vector<AutofillProfile*>& results = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
ASSERT_EQ(0U, results.size());
}
@@ -593,7 +593,7 @@
&imported_credit_card));
ASSERT_FALSE(imported_credit_card);
- const std::vector<AutofillProfile*>& profiles = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
ASSERT_EQ(0U, profiles.size());
const std::vector<CreditCard*>& credit_cards = personal_data_->credit_cards();
ASSERT_EQ(0U, credit_cards.size());
@@ -648,7 +648,7 @@
autofill_test::SetProfileInfo(&expected, "George", NULL,
"Washington", NULL, NULL, "21 Laussat St", NULL,
"San Francisco", "California", "94102", NULL, "(650) 555-0000");
- const std::vector<AutofillProfile*>& results = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
}
@@ -731,7 +731,7 @@
autofill_test::SetProfileInfo(&expected, "George", NULL,
"Washington", "[email protected]", NULL, "21 Laussat St", NULL,
"San Francisco", "California", "94102", NULL, NULL);
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(0, expected.Compare(*results1[0]));
@@ -770,7 +770,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
AutofillProfile expected2;
autofill_test::SetProfileInfo(&expected2, "John", NULL,
@@ -822,7 +822,7 @@
autofill_test::SetProfileInfo(&expected, "George", NULL,
"Washington", "[email protected]", NULL, "21 Laussat St", NULL,
"San Francisco", "California", "94102", NULL, NULL);
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(0, expected.Compare(*results1[0]));
@@ -861,7 +861,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
// Modify expected to include multi-valued fields.
std::vector<string16> values;
@@ -924,7 +924,7 @@
&expected, "George", NULL, "Washington", "[email protected]", NULL,
"1600 Pennsylvania Avenue", "Suite A", "San Francisco", "California",
"94102", NULL, "(650) 555-6666");
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(0, expected.Compare(*results1[0]));
@@ -974,7 +974,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
// Add multi-valued phone number to expectation. Also, country gets added.
std::vector<string16> values;
@@ -1024,7 +1024,7 @@
autofill_test::SetProfileInfo(&expected, "George", NULL,
"Washington", NULL, NULL, "190 High Street", NULL,
"Philadelphia", "Pennsylvania", "19106", NULL, NULL);
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(0, expected.Compare(*results1[0]));
@@ -1063,7 +1063,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
AutofillProfile expected2;
autofill_test::SetProfileInfo(&expected2, "George", NULL,
@@ -1117,7 +1117,7 @@
autofill_test::SetProfileInfo(&expected, "George", NULL,
"Washington", "[email protected]", "Government", "190 High Street", NULL,
"Philadelphia", "Pennsylvania", "19106", NULL, NULL);
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(0, expected.Compare(*results1[0]));
@@ -1157,7 +1157,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
// Expect no change.
ASSERT_EQ(1U, results2.size());
@@ -1195,7 +1195,7 @@
// Note: no refresh here.
- const std::vector<AutofillProfile*>& profiles = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
ASSERT_EQ(0U, profiles.size());
const std::vector<CreditCard*>& credit_cards = personal_data_->credit_cards();
ASSERT_EQ(0U, credit_cards.size());
@@ -1919,7 +1919,7 @@
autofill_test::SetProfileInfo(&expected, "George", NULL,
"Washington", "[email protected]", NULL, "21 Laussat St", NULL,
"San Francisco", "California", "94102", NULL, "(817) 555-6789");
- const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(0, expected.Compare(*results1[0]));
@@ -1961,7 +1961,7 @@
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
+ const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
// Modify expected to include multi-valued fields.
std::vector<string16> values;
