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

Unified Diff: chrome/test/page_cycler/page_cycler_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/page_cycler/page_cycler_test.cc
===================================================================
--- chrome/test/page_cycler/page_cycler_test.cc (revision 73855)
+++ chrome/test/page_cycler/page_cycler_test.cc (working copy)
@@ -250,12 +250,13 @@
ASSERT_FALSE(pages->empty());
// Get the timing cookie value from the DOM automation.
- std::wstring wcookie;
- ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
- L"window.domAutomationController.send("
- L"JSON.stringify(__get_timings()));",
- &wcookie));
- cookie = base::SysWideToNativeMB(wcookie);
+ string16 cookie16;
+ ASSERT_TRUE(tab->ExecuteAndExtractString(
+ string16(),
+ ASCIIToUTF16("window.domAutomationController.send("
+ "JSON.stringify(__get_timings()));"),
+ &cookie16));
+ cookie = base::SysWideToNativeMB(UTF16ToWide(cookie16));
// JSON.stringify() encapsulates the returned string in quotes, strip them.
std::string::size_type start_idx = cookie.find("\"");

Powered by Google App Engine
This is Rietveld 408576698