Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/api/web_request/web_request_apitest.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 "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 173 matching lines @@
   // Test that navigation in regular window is properly redirected.
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   // This navigation should be redirected.
   ui_test_utils::NavigateToURL(
       browser(),
       test_server()->GetURL("files/extensions/test_file.html"));
 
   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);
 
   // Test that navigation in OTR window is properly redirected.
   Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
       browser()->profile(), GURL("about:blank"));
 
   if (wait_for_extension_loaded_in_incognito)
     EXPECT_TRUE(listener_incognito.WaitUntilSatisfied());
 
   // This navigation should be redirected if
   // load_extension_with_incognito_permission is true.
   ui_test_utils::NavigateToURL(
       otr_browser,
       test_server()->GetURL("files/extensions/test_file.html"));
 
   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);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
                        WebRequestDeclarativePermissionSpanning1) {
   // Test spanning with incognito permission.
   RunPermissionTest("spanning", true, false, "redirected1", "redirected1");
 }
@@ skipping 30 matching lines @@
   Feature::ScopedCurrentChannel sc(chrome::VersionInfo::CHANNEL_DEV);
   // Test HTML form POST data access with the multipart and plaintext encoding.
   ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_post2.html")) <<
       message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
                        DeclarativeSendMessage) {
   ASSERT_TRUE(RunExtensionTest("webrequest_sendmessage")) << message_;
 }