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

Unified Diff: chrome/test/ui/ui_test.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/test/ui/ui_test.cc
===================================================================
--- chrome/test/ui/ui_test.cc (revision 73855)
+++ chrome/test/ui/ui_test.cc (working copy)
@@ -335,14 +335,14 @@
}
std::wstring UITestBase::GetActiveTabTitle(int window_index) {
- std::wstring title;
+ string16 title;
scoped_refptr<TabProxy> tab_proxy(GetActiveTab(window_index));
EXPECT_TRUE(tab_proxy.get());
if (!tab_proxy.get())
- return title;
+ return std::wstring();
EXPECT_TRUE(tab_proxy->GetTabTitle(&title));
- return title;
+ return UTF16ToWideHack(title);
}
int UITestBase::GetActiveTabIndex(int window_index) {
@@ -720,7 +720,8 @@
return false;
bool done_value = false;
- bool success = tab->ExecuteAndExtractBool(frame_xpath, jscript,
+ bool success = tab->ExecuteAndExtractBool(WideToUTF16Hack(frame_xpath),
+ WideToUTF16Hack(jscript),
&done_value);
EXPECT_TRUE(success);
if (!success)

Powered by Google App Engine
This is Rietveld 408576698