Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/extension_nacl_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 84 matching lines @@
   void CheckPluginsCreated(const Extension* extension, bool should_create) {
     ui_test_utils::NavigateToURL(browser(),
                                  extension->GetResourceURL("test.html"));
     // Don't run tests if the NaCl plugin isn't loaded.
     if (!IsNaClPluginLoaded())
       return;
 
     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));
 
     EXPECT_EQ(should_create, embedded_plugin_created);
     EXPECT_EQ(should_create, content_handler_plugin_created);
   }
 };
 
 // Test that the NaCl plugin isn't blocked for Webstore extensions.
 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, WebStoreExtension) {
@@ skipping 27 matching lines @@
 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) {
   ASSERT_TRUE(test_server()->Start());
 
   const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED);
   ASSERT_TRUE(extension);
   ASSERT_EQ(extension->location(), Extension::LOAD);
   CheckPluginsCreated(extension, true);
 }
 
 }  // namespace