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

Unified Diff: chrome/browser/unload_uitest.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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: chrome/browser/unload_uitest.cc
===================================================================
--- chrome/browser/unload_uitest.cc (revision 73855)
+++ chrome/browser/unload_uitest.cc (working copy)
@@ -442,17 +442,17 @@
scoped_refptr<TabProxy> popup_tab(browser->GetActiveTab());
ASSERT_TRUE(popup_tab.get());
- std::wstring popup_title;
+ string16 popup_title;
EXPECT_TRUE(popup_tab->GetTabTitle(&popup_title));
- EXPECT_EQ(std::wstring(L"popup"), popup_title);
+ EXPECT_EQ(ASCIIToUTF16("popup"), popup_title);
EXPECT_TRUE(popup_tab->Close(true));
ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
scoped_refptr<TabProxy> main_tab(browser->GetActiveTab());
ASSERT_TRUE(main_tab.get());
- std::wstring main_title;
+ string16 main_title;
EXPECT_TRUE(main_tab->GetTabTitle(&main_title));
- EXPECT_EQ(std::wstring(L"only_one_unload"), main_title);
+ EXPECT_EQ(ASCIIToUTF16("only_one_unload"), main_title);
}
// TODO(ojan): Add tests for unload/beforeunload that have multiple tabs

Powered by Google App Engine
This is Rietveld 408576698