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

Unified Diff: chrome/test/ui/sunspider_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/test/ui/sunspider_uitest.cc
===================================================================
--- chrome/test/ui/sunspider_uitest.cc (revision 73855)
+++ chrome/test/ui/sunspider_uitest.cc (working copy)
@@ -66,10 +66,11 @@
}
bool GetTotal(TabProxy* tab, std::string* total) {
- std::wstring total_wide;
- bool succeeded = tab->ExecuteAndExtractString(L"",
- L"window.domAutomationController.send(automation.GetTotal());",
- &total_wide);
+ string16 total16;
+ bool succeeded = tab->ExecuteAndExtractString(string16(),
+ ASCIIToUTF16("window.domAutomationController.send("
+ "automation.GetTotal());"),
+ &total16);
// Note that we don't use ASSERT_TRUE here (and in some other places) as it
// doesn't work inside a function with a return type other than void.
@@ -77,22 +78,22 @@
if (!succeeded)
return false;
- total->assign(WideToUTF8(total_wide));
+ total->assign(UTF16ToUTF8(total16));
return true;
}
bool GetResults(TabProxy* tab, ResultsMap* results) {
- std::wstring json_wide;
- bool succeeded = tab->ExecuteAndExtractString(L"",
- L"window.domAutomationController.send("
- L" JSON.stringify(automation.GetResults()));",
- &json_wide);
+ string16 json16;
+ bool succeeded = tab->ExecuteAndExtractString(string16(),
+ ASCIIToUTF16("window.domAutomationController.send("
+ "JSON.stringify(automation.GetResults()));"),
+ &json16);
EXPECT_TRUE(succeeded);
if (!succeeded)
return false;
- std::string json = WideToUTF8(json_wide);
+ std::string json = UTF16ToUTF8(json16);
return JsonDictionaryToMap(json, results);
}

Powered by Google App Engine
This is Rietveld 408576698