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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/autofill/browser/contact_info_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
« components/autofill/browser/address.h ('K') | « components/autofill/browser/contact_info.cc ('k') | components/autofill/browser/credit_card.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/browser/contact_info_unittest.cc
diff --git a/components/autofill/browser/contact_info_unittest.cc b/components/autofill/browser/contact_info_unittest.cc
index 377a219fb6c74ac176faed8bcbc3f2ce997ea55e..27d990d555d58a214696c2dda187ece59ad0ef84 100644
--- a/components/autofill/browser/contact_info_unittest.cc
+++ b/components/autofill/browser/contact_info_unittest.cc
@@ -15,13 +15,13 @@ TEST(NameInfoTest, SetFullName) {
NameInfo name;
name.SetRawInfo(NAME_FULL, ASCIIToUTF16("Virgil"));
EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Virgil"));
- EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
- EXPECT_EQ(name.GetRawInfo(NAME_LAST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Virgil"));
name.SetRawInfo(NAME_FULL, ASCIIToUTF16("Murray Gell-Mann"));
EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Murray"));
- EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Gell-Mann"));
EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Murray Gell-Mann"));
@@ -44,49 +44,49 @@ TEST(NameInfoTest, SetFullName) {
TEST(NameInfoTest, GetFullName) {
NameInfo name;
name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
- name.SetRawInfo(NAME_MIDDLE, string16());
- name.SetRawInfo(NAME_LAST, string16());
+ name.SetRawInfo(NAME_MIDDLE, base::string16());
+ name.SetRawInfo(NAME_LAST, base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
- EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
- EXPECT_EQ(name.GetRawInfo(NAME_LAST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First"));
- name.SetRawInfo(NAME_FIRST, string16());
+ name.SetRawInfo(NAME_FIRST, base::string16());
name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
- name.SetRawInfo(NAME_LAST, string16());
- EXPECT_EQ(name.GetRawInfo(NAME_FIRST), string16());
+ name.SetRawInfo(NAME_LAST, base::string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
- EXPECT_EQ(name.GetRawInfo(NAME_LAST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Middle"));
- name.SetRawInfo(NAME_FIRST, string16());
- name.SetRawInfo(NAME_MIDDLE, string16());
+ name.SetRawInfo(NAME_FIRST, base::string16());
+ name.SetRawInfo(NAME_MIDDLE, base::string16());
name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetRawInfo(NAME_FIRST), string16());
- EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), base::string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Last"));
name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
- name.SetRawInfo(NAME_LAST, string16());
+ name.SetRawInfo(NAME_LAST, base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
- EXPECT_EQ(name.GetRawInfo(NAME_LAST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle"));
name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
- name.SetRawInfo(NAME_MIDDLE, string16());
+ name.SetRawInfo(NAME_MIDDLE, base::string16());
name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
- EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Last"));
- name.SetRawInfo(NAME_FIRST, string16());
+ name.SetRawInfo(NAME_FIRST, base::string16());
name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetRawInfo(NAME_FIRST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), base::string16());
EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Middle Last"));
« components/autofill/browser/address.h ('K') | « components/autofill/browser/contact_info.cc ('k') | components/autofill/browser/credit_card.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698