Replace string16 with base::string16.

chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc

Index: chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
index f33106f9e1b3fe9ada7a5f4ebd9a0abe87993b7f..56a979e6fd3b0cd324598851d925f7b7ad9e3a46 100644
--- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
@@ -133,7 +133,7 @@ class ProfileListChromeOSTest : public testing::Test {
 };
 
 TEST_F(ProfileListChromeOSTest, InitialCreation) {
-  string16 name1(ASCIIToUTF16("p1"));
+  base::string16 name1(ASCIIToUTF16("p1"));
 
   AddProfile(name1, true);
 
@@ -147,10 +147,10 @@ TEST_F(ProfileListChromeOSTest, InitialCreation) {
 }
 
 TEST_F(ProfileListChromeOSTest, ShowLoggedInUsers) {
-  string16 name1(ASCIIToUTF16("p1"));
-  string16 name2(ASCIIToUTF16("p2"));
-  string16 name3(ASCIIToUTF16("p3"));
-  string16 name4(ASCIIToUTF16("p4"));
+  base::string16 name1(ASCIIToUTF16("p1"));
+  base::string16 name2(ASCIIToUTF16("p2"));
+  base::string16 name3(ASCIIToUTF16("p3"));
+  base::string16 name4(ASCIIToUTF16("p4"));
 
   AddProfile(name1, true);
   AddProfile(name2, false);
@@ -171,8 +171,8 @@ TEST_F(ProfileListChromeOSTest, ShowLoggedInUsers) {
 }
 
 TEST_F(ProfileListChromeOSTest, DontShowManagedUsers) {
-  string16 name1(ASCIIToUTF16("p1"));
-  string16 managed_name(ASCIIToUTF16("p2@example.com"));
+  base::string16 name1(ASCIIToUTF16("p1"));
+  base::string16 managed_name(ASCIIToUTF16("p2@example.com"));
 
   AddProfile(name1, true);
 
@@ -180,7 +180,7 @@ TEST_F(ProfileListChromeOSTest, DontShowManagedUsers) {
   ProfileInfoCache* cache = manager()->profile_info_cache();
   manager()->profile_info_cache()->AddProfileToCache(
       cache->GetUserDataDir().AppendASCII("p2"), managed_name,
-      string16(), 0, "TEST_ID");
+      base::string16(), 0, "TEST_ID");
 
   GetFakeUserManager()->AddUser(UTF16ToASCII(managed_name));
 
@@ -193,8 +193,8 @@ TEST_F(ProfileListChromeOSTest, DontShowManagedUsers) {
 }
 
 TEST_F(ProfileListChromeOSTest, ShowAddProfileLink) {
-  string16 name1(ASCIIToUTF16("p1.com"));
-  string16 name2(ASCIIToUTF16("p2.com"));
+  base::string16 name1(ASCIIToUTF16("p1.com"));
+  base::string16 name2(ASCIIToUTF16("p2.com"));
 
   AddProfile(name1, true);
   AddProfile(name2, false);
@@ -206,8 +206,8 @@ TEST_F(ProfileListChromeOSTest, ShowAddProfileLink) {
 }
 
 TEST_F(ProfileListChromeOSTest, DontShowAddProfileLink) {
-  string16 name1(ASCIIToUTF16("p1.com"));
-  string16 name2(ASCIIToUTF16("p2.com"));
+  base::string16 name1(ASCIIToUTF16("p1.com"));
+  base::string16 name2(ASCIIToUTF16("p2.com"));
 
   AddProfile(name1, true);
   AddProfile(name2, true);
@@ -219,8 +219,8 @@ TEST_F(ProfileListChromeOSTest, DontShowAddProfileLink) {
 }
 
 TEST_F(ProfileListChromeOSTest, ActiveItem) {
-  string16 name1(ASCIIToUTF16("p1.com"));
-  string16 name2(ASCIIToUTF16("p2.com"));
+  base::string16 name1(ASCIIToUTF16("p1.com"));
+  base::string16 name2(ASCIIToUTF16("p2.com"));
 
   AddProfile(name1, true);
   AddProfile(name2, true);
@@ -234,9 +234,9 @@ TEST_F(ProfileListChromeOSTest, ActiveItem) {
 }
 
 TEST_F(ProfileListChromeOSTest, ModifyingNameResortsCorrectly) {
-  string16 name1(ASCIIToUTF16("Alpha"));
-  string16 name2(ASCIIToUTF16("Beta"));
-  string16 newname1(ASCIIToUTF16("Gamma"));
+  base::string16 name1(ASCIIToUTF16("Alpha"));
+  base::string16 name2(ASCIIToUTF16("Beta"));
+  base::string16 newname1(ASCIIToUTF16("Gamma"));
 
   AddProfile(name1, true);
   AddProfile(name2, true);
@@ -270,8 +270,8 @@ TEST_F(ProfileListChromeOSTest, ModifyingNameResortsCorrectly) {
 }
 
 TEST_F(ProfileListChromeOSTest, ChangeOnNotify) {
-  string16 name1(ASCIIToUTF16("p1.com"));
-  string16 name2(ASCIIToUTF16("p2.com"));
+  base::string16 name1(ASCIIToUTF16("p1.com"));
+  base::string16 name2(ASCIIToUTF16("p2.com"));
 
   AddProfile(name1, true);
   AddProfile(name2, true);
@@ -279,7 +279,7 @@ TEST_F(ProfileListChromeOSTest, ChangeOnNotify) {
   AvatarMenu* menu = GetAvatarMenu();
   EXPECT_EQ(2U, menu->GetNumberOfItems());
 
-  string16 name3(ASCIIToUTF16("p3.com"));
+  base::string16 name3(ASCIIToUTF16("p3.com"));
   AddProfile(name3, true);
 
   // Four changes happened via the call to CreateTestingProfile: adding the
@@ -304,8 +304,8 @@ TEST_F(ProfileListChromeOSTest, ChangeOnNotify) {
 
 TEST_F(ProfileListChromeOSTest, DontShowAvatarMenu) {
   // If in the new M-32 UX mode the icon gets shown, the menu will not.
-  string16 name1(ASCIIToUTF16("p1"));
-  string16 name2(ASCIIToUTF16("p2"));
+  base::string16 name1(ASCIIToUTF16("p1"));
+  base::string16 name2(ASCIIToUTF16("p2"));
 
   AddProfile(name1, true);
 
@@ -322,8 +322,8 @@ TEST_F(ProfileListChromeOSTest, ShowAvatarMenuInM31) {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(ash::switches::kAshEnableFullMultiProfileMode);
 
-  string16 name1(ASCIIToUTF16("p1"));
-  string16 name2(ASCIIToUTF16("p2"));
+  base::string16 name1(ASCIIToUTF16("p1"));
+  base::string16 name2(ASCIIToUTF16("p2"));
 
   AddProfile(name1, true);