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

Unified Diff: chrome/browser/extensions/extension_browsertest.cc

Issue 11728003: Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding files for gpu_tests and NaCl browser tests. Created 7 years, 12 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/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index f53505ae4635a58384c4718500f980e0dc01999f..7c772f413cbab9ec48800632232d7940b0e80271 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -553,8 +553,9 @@ void ExtensionBrowserTest::OpenWindow(content::WebContents* contents,
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
ASSERT_TRUE(content::ExecuteJavaScript(
- contents->GetRenderViewHost(), L"",
- L"window.open('" + UTF8ToWide(url.spec()) + L"');"));
+ contents->GetRenderViewHost(),
+ "",
+ "window.open('" + url.spec() + "');"));
// The above window.open call is not user-initiated, so it will create
// a popup window instead of a new tab in current window.
@@ -581,11 +582,12 @@ void ExtensionBrowserTest::NavigateInRenderer(content::WebContents* contents,
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- contents->GetRenderViewHost(), L"",
- L"window.addEventListener('unload', function() {"
- L" window.domAutomationController.send(true);"
- L"}, false);"
- L"window.location = '" + UTF8ToWide(url.spec()) + L"';",
+ contents->GetRenderViewHost(),
+ "",
+ "window.addEventListener('unload', function() {"
+ " window.domAutomationController.send(true);"
+ "}, false);"
+ "window.location = '" + url.spec() + "';",
&result));
ASSERT_TRUE(result);
observer.Wait();
« no previous file with comments | « chrome/browser/extensions/extension_bindings_apitest.cc ('k') | chrome/browser/extensions/extension_dom_clipboard_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698