| Index: chrome/test/ui_test_utils.cc
|
| ===================================================================
|
| --- chrome/test/ui_test_utils.cc (revision 73805)
|
| +++ chrome/test/ui_test_utils.cc (working copy)
|
| @@ -288,7 +288,8 @@
|
| // 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 @@
|
| // 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))
|
|
|