From 7024d3eea1d8328883736f5cd3cbef480aa0e740 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Tue, 8 Feb 2011 15:42:00 +0000 Subject: Remove wstring from RVH's run Javascript command. BUG=23581 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6312154 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74118 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/page_cycler/page_cycler_test.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'chrome/test/page_cycler') diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc index 3ba9f67..e09b15b 100644 --- a/chrome/test/page_cycler/page_cycler_test.cc +++ b/chrome/test/page_cycler/page_cycler_test.cc @@ -250,12 +250,13 @@ class PageCyclerTest : public UIPerfTest { 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("\""); -- cgit v1.1