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

Unified Diff: chrome/browser/extensions/api/web_request/web_request_apitest.cc

Issue 11753009: Simplify ExecuteJavaScript* functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update prerender_browsertest.cc. 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/api/web_request/web_request_apitest.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
index ada42b5af530bbcc6de226c73f4dc5625d1ab0e6..66cebfb4e6e0a3cc56109dac9ff2df8e6d7dfd00 100644
--- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -191,9 +191,8 @@ void ExtensionWebRequestApiTest::RunPermissionTest(
std::string body;
WebContents* tab = chrome::GetActiveWebContents(browser());
- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- tab->GetRenderViewHost(),
- "",
+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+ tab,
"window.domAutomationController.send(document.body.textContent)",
&body));
EXPECT_EQ(expected_content_regular_window, body);
@@ -213,9 +212,8 @@ void ExtensionWebRequestApiTest::RunPermissionTest(
body.clear();
WebContents* otr_tab = chrome::GetActiveWebContents(otr_browser);
- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- otr_tab->GetRenderViewHost(),
- "",
+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+ otr_tab,
"window.domAutomationController.send(document.body.textContent)",
&body));
EXPECT_EQ(exptected_content_incognito_window, body);
« no previous file with comments | « chrome/browser/extensions/api/management/management_browsertest.cc ('k') | chrome/browser/extensions/app_process_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698