Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

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

Issue 13973004: Convert string16 -> base::string16 in components/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Download patch
Index: components/autofill/browser/personal_data_manager_unittest.cc
diff --git a/components/autofill/browser/personal_data_manager_unittest.cc b/components/autofill/browser/personal_data_manager_unittest.cc
index d7e10618509c4df9dd7a40f46d8d0412ca94bcfe..7cd960abd2be5377e6e5f4ba6e81ace92f659409 100644
--- a/components/autofill/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/browser/personal_data_manager_unittest.cc
@@ -1022,7 +1022,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoProfilesWithMultiValue) {
const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
// Modify expected to include multi-valued fields.
- std::vector<string16> values;
+ std::vector<base::string16> values;
expected.GetRawMultiInfo(NAME_FULL, &values);
values.push_back(ASCIIToUTF16("John Adams"));
expected.SetRawMultiInfo(NAME_FULL, values);
@@ -1135,7 +1135,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) {
const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
// Add multi-valued phone number to expectation. Also, country gets added.
- std::vector<string16> values;
+ std::vector<base::string16> values;
expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
values.push_back(ASCIIToUTF16("(650) 223-1234"));
expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
@@ -2122,7 +2122,7 @@ TEST_F(PersonalDataManagerTest, CaseInsensitiveMultiValueAggregation) {
const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
// Modify expected to include multi-valued fields.
- std::vector<string16> values;
+ std::vector<base::string16> values;
expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
values.push_back(ASCIIToUTF16("(214) 555-1234"));
expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);

Powered by Google App Engine
This is Rietveld 408576698