wstring cleanup in browser/ui/login

chrome/browser/ui/login/login_prompt_uitest.cc

Index: chrome/browser/ui/login/login_prompt_uitest.cc
diff --git a/chrome/browser/ui/login/login_prompt_uitest.cc b/chrome/browser/ui/login/login_prompt_uitest.cc
index 9a375b39af7c97b50aa924588e56beda32f8495f..e8c725af1f6fff7dc6e780816b11f3478087d37e 100644
--- a/chrome/browser/ui/login/login_prompt_uitest.cc
+++ b/chrome/browser/ui/login/login_prompt_uitest.cc
@@ -23,10 +23,10 @@ const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
 class LoginPromptTest : public UITest {
  protected:
   LoginPromptTest()
-      : username_basic_(L"basicuser"),
-        username_digest_(L"digestuser"),
-        password_(L"secret"),
-        password_bad_(L"denyme"),
+      : username_basic_("basicuser"),
+        username_digest_("digestuser"),
+        password_("secret"),
+        password_bad_("denyme"),
         test_server_(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)) {
   }
 
@@ -37,18 +37,18 @@ class LoginPromptTest : public UITest {
   }
 
  protected:
-  wstring username_basic_;
-  wstring username_digest_;
-  wstring password_;
-  wstring password_bad_;
+  std::string username_basic_;
+  std::string username_digest_;
+  std::string password_;
+  std::string password_bad_;
 
   net::TestServer test_server_;
 };
 
-wstring ExpectedTitleFromAuth(const wstring& username,
-                              const wstring& password) {
+std::string ExpectedTitleFromAuth(const std::string& username,
+                              const std::string& password) {
   // The TestServer sets the title to username/password on successful login.
-  return username + L"/" + password;
+  return username + "/" + password;
 }
 
 // Test that "Basic" HTTP authentication works.
@@ -120,10 +120,12 @@ TEST_F(LoginPromptTest, TestTwoAuths) {
 
   wstring title;
   EXPECT_TRUE(basic_tab->GetTabTitle(&title));
-  EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), title);
+  EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_),
+            WideToUTF8Hack(title));
 
   EXPECT_TRUE(digest_tab->GetTabTitle(&title));
-  EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_), title);
+  EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_),
+            WideToUTF8Hack(title));
 }
 
 // If multiple tabs are looking for the same auth, the user should only have to
@@ -153,10 +155,12 @@ TEST_F(LoginPromptTest, SupplyRedundantAuths) {
   // Now both tabs have loaded.
   wstring title1;
   EXPECT_TRUE(basic_tab1->GetTabTitle(&title1));
-  EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), title1);
+  EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_),
+            WideToUTF8Hack(title1));
   wstring title2;
   EXPECT_TRUE(basic_tab2->GetTabTitle(&title2));
-  EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), title2);
+  EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_),
+            WideToUTF8Hack(title2));
 }
 
 // If multiple tabs are looking for the same auth, and one is cancelled, the