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

Unified Diff: chrome/browser/history/redirect_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/history/redirect_uitest.cc
===================================================================
--- chrome/browser/history/redirect_uitest.cc (revision 73855)
+++ chrome/browser/history/redirect_uitest.cc (working copy)
@@ -260,9 +260,9 @@
// title from the file, because the nav should not have taken place.
scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
ASSERT_TRUE(tab_proxy.get());
- std::wstring actual_title;
+ string16 actual_title;
ASSERT_TRUE(tab_proxy->GetTabTitle(&actual_title));
- EXPECT_NE("File!", WideToUTF8(actual_title));
+ EXPECT_NE("File!", UTF16ToUTF8(actual_title));
}
// Ensures that non-user initiated location changes (within page) are
@@ -315,8 +315,8 @@
// hasn't completed. Our time is now!
NavigateToURL(final_url);
- std::wstring tab_title;
- std::wstring final_url_title = UTF8ToWide("Title Of Awesomeness");
+ string16 tab_title;
+ string16 final_url_title = ASCIIToUTF16("Title Of Awesomeness");
// Wait till the final page has been loaded.
for (int i = 0; i < 10; ++i) {
base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());

Powered by Google App Engine
This is Rietveld 408576698