Simplify ExecuteJavaScript* functions.
Remove the "Java" and rename to ExecuteScript*. This better matches
conventions elsewhere in the codebase.
Introduce ExecuteScriptInFrame* variants for the less common case
where script execution in a subframe is desired.
Make it possible to pass the ExecuteScript* family of functions either
a WebContents pointer or a RenderViewHost pointer to further simplify
callsites.
[email protected]
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11753009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175156 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc
index 2939278..7d8d34c 100644
--- a/chrome/browser/extensions/extension_nacl_browsertest.cc
+++ b/chrome/browser/extensions/extension_nacl_browsertest.cc
@@ -102,14 +102,12 @@
bool embedded_plugin_created = false;
bool content_handler_plugin_created = false;
WebContents* web_contents = chrome::GetActiveWebContents(browser());
- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- web_contents->GetRenderViewHost(),
- "",
+ ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+ web_contents,
"window.domAutomationController.send(EmbeddedPluginCreated());",
&embedded_plugin_created));
- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- web_contents->GetRenderViewHost(),
- "",
+ ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+ web_contents,
"window.domAutomationController.send(ContentHandlerPluginCreated());",
&content_handler_plugin_created));
