diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 15:42:00 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 15:42:00 +0000 |
| commit | 7024d3eea1d8328883736f5cd3cbef480aa0e740 (patch) | |
| tree | 5fc40e7da24d79306321037359bce7bd97bcf36b /chrome/test/ui_test_utils.cc | |
| parent | e9ff5e31b28b6ee684ceaf47afe4f483163f6d1d (diff) | |
| download | chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.zip chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.tar.gz chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.tar.bz2 | |
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
Diffstat (limited to 'chrome/test/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index 436273b..4712faf 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -288,7 +288,8 @@ class InProcessJavaScriptExecutionController // Executes |script| and sets the JSON response |json|. virtual bool ExecuteJavaScriptAndGetJSON(const std::string& script, std::string* json) { - render_view_host_->ExecuteJavascriptInWebFrame(L"", UTF8ToWide(script)); + render_view_host_->ExecuteJavascriptInWebFrame(string16(), + UTF8ToUTF16(script)); DOMOperationObserver dom_op_observer(render_view_host_); return dom_op_observer.GetResponse(json); } @@ -323,7 +324,8 @@ bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host, // automation id. std::wstring script = L"window.domAutomationController.setAutomationId(0);" + original_script; - render_view_host->ExecuteJavascriptInWebFrame(frame_xpath, script); + render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(frame_xpath), + WideToUTF16Hack(script)); DOMOperationObserver dom_op_observer(render_view_host); std::string json; if (!dom_op_observer.GetResponse(&json)) |