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.

R=jam@chromium.org
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

72 files changed, 707 insertions, 923 deletions

diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index ab3cc2c..0c045d8 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -217,8 +217,7 @@ class AutofillTest : public InProcessBrowserTest {
     js += "document.getElementById('testform').submit();";
 
     WindowedPersonalDataManagerObserver observer(browser());
-    ASSERT_TRUE(
-        content::ExecuteJavaScript(render_view_host(), "", js));
+    ASSERT_TRUE(content::ExecuteScript(render_view_host(), js));
     observer.Wait();
   }
 
@@ -239,8 +238,7 @@ class AutofillTest : public InProcessBrowserTest {
   // sends keypress events to the tab to cause the form to be populated.
   void PopulateForm(const std::string& field_id) {
     std::string js("document.getElementById('" + field_id + "').focus();");
-    ASSERT_TRUE(
-        content::ExecuteJavaScript(render_view_host(), "", js));
+    ASSERT_TRUE(content::ExecuteScript(render_view_host(), js));
 
     SendKeyAndWait(ui::VKEY_DOWN,
                    chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
@@ -292,9 +290,8 @@ class AutofillTest : public InProcessBrowserTest {
   void ExpectFieldValue(const std::string& field_name,
                         const std::string& expected_value) {
     std::string value;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        chrome::GetActiveWebContents(browser()),
         "window.domAutomationController.send("
         "    document.getElementById('" + field_name + "').value);",
         &value));
@@ -352,9 +349,8 @@ class AutofillTest : public InProcessBrowserTest {
 
     LOG(WARNING) << "Focusing the first name field.";
     bool result = false;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         render_view_host(),
-        "",
         "if (document.readyState === 'complete')"
         "  document.getElementById('firstname').focus();"
         "else"
@@ -539,24 +535,20 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_OnChangeAfterAutofill) {
   bool unfocused_fired = false;
   bool changed_select_fired = false;
   bool unchanged_select_fired = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "domAutomationController.send(focused_fired);",
       &focused_fired));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "domAutomationController.send(unfocused_fired);",
       &unfocused_fired));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "domAutomationController.send(changed_select_fired);",
       &changed_select_fired));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "domAutomationController.send(unchanged_select_fired);",
       &unchanged_select_fired));
   EXPECT_FALSE(focused_fired);
@@ -565,9 +557,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_OnChangeAfterAutofill) {
   EXPECT_FALSE(unchanged_select_fired);
 
   // Unfocus the first name field. Its change event should fire.
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "document.getElementById('firstname').blur();"
       "domAutomationController.send(focused_fired);", &focused_fired));
   EXPECT_TRUE(focused_fired);
@@ -780,8 +771,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_DynamicFormFill) {
            "</script>")));
 
   // Dynamically construct the form.
-  ASSERT_TRUE(content::ExecuteJavaScript(render_view_host(), "",
-                                         "BuildForm();"));
+  ASSERT_TRUE(content::ExecuteScript(render_view_host(), "BuildForm();"));
 
   // Invoke Autofill.
   TryBasicFormFill();
@@ -879,10 +869,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillAfterTranslate) {
   // Simulate translation to kick onTranslateElementLoad.
   // But right now, the call stucks here.
   // Once click the text field, it starts again.
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      render_view_host(),
-      "",
-      "cr.googleTranslate.onTranslateElementLoad();"));
+  ASSERT_TRUE(content::ExecuteScript(
+      render_view_host(), "cr.googleTranslate.onTranslateElementLoad();"));
 
   // Simulate the render notifying the translation has been done.
   translation_observer.Wait();
@@ -1370,9 +1358,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillableOnReset) {
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "document.getElementById('testform').reset()"));
 
   PopulateForm("NAME_FIRST");
@@ -1522,9 +1509,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillLatencyAfterSubmit) {
       content::Source<content::NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
+  ASSERT_TRUE(content::ExecuteScript(
       render_view_host(),
-      "",
       "document.getElementById('testform').submit();"));
   // This will ensure the test didn't hang.
   load_stop_observer.Wait();
@@ -1555,9 +1541,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_DisableAutocompleteWhileFilling) {
 
   // Now that the popup with suggestions is showing, disable autocomplete for
   // the active field.
-  ASSERT_TRUE(content::ExecuteJavaScript(
+  ASSERT_TRUE(content::ExecuteScript(
       render_view_host(),
-      "",
       "document.querySelector('input').autocomplete = 'off';"));
 
   // Press the down arrow to select the suggestion and attempt to preview the
@@ -1568,9 +1553,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_DisableAutocompleteWhileFilling) {
   // Wait for any IPCs to complete by performing an action that generates an
   // IPC that's easy to wait for.  Chrome shouldn't crash.
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "var city = document.getElementById('city');"
       "city.onfocus = function() { domAutomationController.send(true); };"
       "city.focus()",
diff --git a/chrome/browser/automation/automation_misc_browsertest.cc b/chrome/browser/automation/automation_misc_browsertest.cc
index 9056332..597ace3 100644
--- a/chrome/browser/automation/automation_misc_browsertest.cc
+++ b/chrome/browser/automation/automation_misc_browsertest.cc
@@ -73,9 +73,8 @@ IN_PROC_BROWSER_TEST_F(AutomationMiscBrowserTest, ProcessMouseEvent) {
 
   content::RenderViewHost* view =
       chrome::GetActiveWebContents(browser())->GetRenderViewHost();
-  ASSERT_TRUE(content::ExecuteJavaScript(
+  ASSERT_TRUE(content::ExecuteScript(
       view,
-      "",
       "window.didClick = false;"
       "document.body.innerHTML ="
       "    '<a style=\\'position:absolute; left:0; top:0\\'>link</a>';"
@@ -98,9 +97,8 @@ IN_PROC_BROWSER_TEST_F(AutomationMiscBrowserTest, ProcessMouseEvent) {
       mock.error_callback());
 
   bool did_click = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       view,
-      "",
       "window.domAutomationController.send(window.didClick);",
       &did_click));
   EXPECT_TRUE(did_click);
diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc
index d630a49..6566518 100644
--- a/chrome/browser/automation/automation_tab_helper_browsertest.cc
+++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc
@@ -92,8 +92,7 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest {
     content::RenderViewHost* host =
         chrome::GetActiveWebContents(browser())->GetRenderViewHost();
     if (wait_for_response) {
-      ASSERT_TRUE(content::ExecuteJavaScript(
-          host, "", script));
+      ASSERT_TRUE(content::ExecuteScript(host, script));
     } else {
       script += "window.domAutomationController.setAutomationId(0);"
                 "window.domAutomationController.send(0);";
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 4b37d6c..eb52f36 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -146,9 +146,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
   void SuppressEventByType(int tab_index, const wchar_t* type, bool suppress) {
     ASSERT_LT(tab_index, browser()->tab_count());
     bool actual;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        chrome::GetWebContentsAt(browser(), tab_index),
         base::StringPrintf(kSuppressEventJS, type, GetBoolString(!suppress)),
         &actual));
     ASSERT_EQ(!suppress, actual);
@@ -172,9 +171,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
 
   void GetResultLength(int tab_index, int* length) {
     ASSERT_LT(tab_index, browser()->tab_count());
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
-        chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
+        chrome::GetWebContentsAt(browser(), tab_index),
         kGetResultLengthJS,
         length));
   }
@@ -186,9 +184,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
     ASSERT_GE(actual_length, length);
     for (int i = 0; i < actual_length; ++i) {
       std::string actual;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-          chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-          "",
+      ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+          chrome::GetWebContentsAt(browser(), tab_index),
           base::StringPrintf(kGetResultJS, i),
           &actual));
 
@@ -204,9 +201,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
   void CheckFocusedElement(int tab_index, const wchar_t* focused) {
     ASSERT_LT(tab_index, browser()->tab_count());
     std::string actual;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        chrome::GetWebContentsAt(browser(), tab_index),
         kGetFocusedElementJS,
         &actual));
     ASSERT_EQ(WideToUTF8(focused), actual);
@@ -215,9 +211,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
   void SetFocusedElement(int tab_index, const wchar_t* focused) {
     ASSERT_LT(tab_index, browser()->tab_count());
     bool actual;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        chrome::GetWebContentsAt(browser(), tab_index),
         base::StringPrintf(kSetFocusedElementJS, focused),
         &actual));
     ASSERT_TRUE(actual);
@@ -227,9 +222,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
                          const wchar_t* value) {
     ASSERT_LT(tab_index, browser()->tab_count());
     std::string actual;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        chrome::GetWebContentsAt(browser(), tab_index),
         base::StringPrintf(kGetTextBoxValueJS, id),
         &actual));
     ASSERT_EQ(WideToUTF8(value), actual);
@@ -239,9 +233,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
                        const wchar_t* value) {
     ASSERT_LT(tab_index, browser()->tab_count());
     std::string actual;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        chrome::GetWebContentsAt(browser(), tab_index),
         base::StringPrintf(kSetTextBoxValueJS, id, value),
         &actual));
     ASSERT_EQ(WideToUTF8(value), actual);
@@ -250,9 +243,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
   void StartTest(int tab_index, int result_length) {
     ASSERT_LT(tab_index, browser()->tab_count());
     bool actual;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        chrome::GetWebContentsAt(browser(), tab_index),
         base::StringPrintf(kStartTestJS, result_length),
         &actual));
     ASSERT_TRUE(actual);
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
index 3d34b75..e67a8e7 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
@@ -46,11 +46,8 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
   void RunScriptAndCheckResult(const std::string& script,
                                const std::string& result) {
     std::string data;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        "",
-        script,
-        &data));
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        chrome::GetActiveWebContents(browser()), script, &data));
     ASSERT_EQ(data, result);
   }
 
diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc
index 371d3124..5464f27 100644
--- a/chrome/browser/chrome_switches_browsertest.cc
+++ b/chrome/browser/chrome_switches_browsertest.cc
@@ -39,9 +39,8 @@ IN_PROC_BROWSER_TEST_F(HostRulesTest, TestMap) {
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   std::string html;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.body.outerHTML);",
       &html));
 
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index c2ff3e2..b34c95b1 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -379,10 +379,8 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, LoadAllBlockedPlugins) {
   content::TitleWatcher title_watcher2(
       chrome::GetActiveWebContents(browser()), expected_title2);
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
-      "window.inject()"));
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()), "window.inject()"));
 
   EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle());
 }
@@ -396,9 +394,8 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, NoCallbackAtLoad) {
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Inject the callback function into the HTML page generated by the browser.
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "CallOnStartup = function() { document.title = \"OK\"; }"));
 
   string16 expected_title(ASCIIToUTF16("OK"));
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 0f40d9e..0d8ea11 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -98,18 +98,16 @@ void RunTestFunction(DevToolsWindow* window, const char* test_name) {
   // checking that global variable uiTests exists(it's created after all js
   // files have been loaded) and has runTest method.
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
+      content::ExecuteScriptAndExtractString(
           window->GetRenderViewHost(),
-          "",
           "window.domAutomationController.send("
           "    '' + (window.uiTests && (typeof uiTests.runTest)));",
           &result));
 
   if (result == "function") {
     ASSERT_TRUE(
-        content::ExecuteJavaScriptAndExtractString(
+        content::ExecuteScriptAndExtractString(
             window->GetRenderViewHost(),
-            "",
             base::StringPrintf("uiTests.runTest('%s')", test_name),
             &result));
     EXPECT_EQ("[OK]", result);
@@ -530,9 +528,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) {
   OpenDevToolsWindow("about:blank");
   std::string result;
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
+      content::ExecuteScriptAndExtractString(
           window_->GetRenderViewHost(),
-          "",
           "window.domAutomationController.send("
           "    '' + (window.uiTests && (typeof uiTests.runTest)));",
           &result));
diff --git a/chrome/browser/do_not_track_browsertest.cc b/chrome/browser/do_not_track_browsertest.cc
index a133f8e..fb30fcf 100644
--- a/chrome/browser/do_not_track_browsertest.cc
+++ b/chrome/browser/do_not_track_browsertest.cc
@@ -65,9 +65,8 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, DOMProperty) {
       chrome::GetActiveWebContents(browser())));
 
   std::string do_not_track;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(navigator.doNotTrack)",
       &do_not_track));
   EXPECT_EQ("1", do_not_track);
@@ -76,9 +75,8 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, DOMProperty) {
   // renderer.
   prefs->SetBoolean(prefs::kEnableDoNotTrack, false);
 
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send("
       "    navigator.doNotTrack === null ? '0' : '1')",
       &do_not_track));
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 5333bac..f435c40 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -996,9 +996,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadResourceThrottleCancels) {
       NULL,
       1);
   bool download_assempted;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(startDownload());",
       &download_assempted));
   ASSERT_TRUE(download_assempted);
@@ -1425,9 +1424,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, ChromeURLAfterDownload) {
   WebContents* contents = chrome::GetActiveWebContents(browser());
   ASSERT_TRUE(contents);
   bool webui_responded = false;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      contents,
       "window.domAutomationController.send(window.webui_responded_);",
       &webui_responded));
   EXPECT_TRUE(webui_responded);
@@ -1445,9 +1443,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, BrowserCloseAfterDownload) {
   WebContents* contents = chrome::GetActiveWebContents(browser());
   ASSERT_TRUE(contents);
   bool result = false;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      contents,
       "window.onunload = function() { var do_nothing = 0; }; "
       "window.domAutomationController.send(true);",
       &result));
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
index 6b01236..2464153 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -55,8 +55,8 @@ class ExtensionManagementTest : public ExtensionBrowserTest {
       return false;
 
     std::string version_from_bg;
-    bool exec = content::ExecuteJavaScriptAndExtractString(
-        ext_host->render_view_host(), "", "version()", &version_from_bg);
+    bool exec = content::ExecuteScriptAndExtractString(
+        ext_host->render_view_host(), "version()", &version_from_bg);
     EXPECT_TRUE(exec);
     if (!exec)
       return false;
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 ada42b5..66cebfb 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);
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 241ad9d..3f81fa9 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -224,9 +224,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
   EXPECT_EQ(tab->GetRenderProcessHost(),
             chrome::GetWebContentsAt(browser(), 6)->GetRenderProcessHost());
   bool windowOpenerValid = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      chrome::GetWebContentsAt(browser(), 6),
       "window.domAutomationController.send(window.opener != null)",
       &windowOpenerValid));
   ASSERT_TRUE(windowOpenerValid);
@@ -435,8 +434,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
-  ASSERT_TRUE(content::ExecuteJavaScript(contents->GetRenderViewHost(),
-                                         "", "location.reload();"));
+  ASSERT_TRUE(content::ExecuteScript(contents, "location.reload();"));
   js_reload_observer.Wait();
   EXPECT_TRUE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
@@ -447,8 +445,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
-  ASSERT_TRUE(content::ExecuteJavaScript(contents->GetRenderViewHost(),
-                                         "", "location = location;"));
+  ASSERT_TRUE(content::ExecuteScript(contents, "location = location;"));
   js_reload_observer2.Wait();
   EXPECT_FALSE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
@@ -556,9 +553,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromExtension) {
 
   // App has loaded, and chrome.app.isInstalled should be true.
   bool is_installed = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
@@ -626,9 +622,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) {
   EXPECT_TRUE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
   bool is_installed = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      contents,
       "window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
@@ -641,9 +636,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) {
           &chrome::GetActiveWebContents(browser())->GetController()));
   chrome::Reload(browser(), CURRENT_TAB);
   observer.Wait();
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      contents,
       "window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc
index 36c9ec8..1b4b008 100644
--- a/chrome/browser/extensions/chrome_app_api_browsertest.cc
+++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc
@@ -33,9 +33,11 @@ class ChromeAppAPITest : public ExtensionBrowserTest {
         "window.domAutomationController.send(window.chrome.app.isInstalled);";
     bool result;
     CHECK(
-        content::ExecuteJavaScriptAndExtractBool(
-            chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-            frame_xpath, kGetAppIsInstalled, &result));
+        content::ExecuteScriptInFrameAndExtractBool(
+            chrome::GetActiveWebContents(browser()),
+            frame_xpath,
+            kGetAppIsInstalled,
+            &result));
     return result;
   }
 
@@ -46,9 +48,11 @@ class ChromeAppAPITest : public ExtensionBrowserTest {
         "    function(s) { window.domAutomationController.send(s); });";
     std::string result;
     CHECK(
-        content::ExecuteJavaScriptAndExtractString(
-            chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-            frame_xpath, kGetAppInstallState, &result));
+        content::ExecuteScriptInFrameAndExtractString(
+            chrome::GetActiveWebContents(browser()),
+            frame_xpath,
+            kGetAppInstallState,
+            &result));
     return result;
   }
 
@@ -59,9 +63,11 @@ class ChromeAppAPITest : public ExtensionBrowserTest {
         "    window.chrome.app.runningState());";
     std::string result;
     CHECK(
-        content::ExecuteJavaScriptAndExtractString(
-            chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-            frame_xpath, kGetAppRunningState, &result));
+        content::ExecuteScriptInFrameAndExtractString(
+            chrome::GetActiveWebContents(browser()),
+            frame_xpath,
+            kGetAppRunningState,
+            &result));
     return result;
   }
 
@@ -113,9 +119,8 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {
       "    JSON.stringify(window.chrome.app.getDetails()));";
   std::string result;
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           kGetAppDetails,
           &result));
   EXPECT_EQ("null", result);
@@ -128,9 +133,8 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {
   // chrome.app.getDetails().
   ui_test_utils::NavigateToURL(browser(), app_url);
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           kGetAppDetails,
           &result));
   scoped_ptr<DictionaryValue> app_details(
@@ -143,9 +147,8 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {
   // Try to change app.isInstalled.  Should silently fail, so
   // that isInstalled should have the initial value.
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           "window.domAutomationController.send("
           "    function() {"
           "        var value = window.chrome.app.isInstalled;"
@@ -194,9 +197,8 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) {
       "window.domAutomationController.send(window.testUnsuccessfulAccess())";
   bool result = false;
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractBool(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractBool(
+          chrome::GetActiveWebContents(browser()),
           kTestUnsuccessfulAccess,
           &result));
   EXPECT_TRUE(result);
@@ -209,9 +211,8 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) {
       "    JSON.stringify(chrome.app.getDetailsForFrame(frames[0])))";
   std::string json;
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           kGetDetailsForFrame,
           &json));
 
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc
index 1adc67d..b675403 100644
--- a/chrome/browser/extensions/content_script_apitest.cc
+++ b/chrome/browser/extensions/content_script_apitest.cc
@@ -123,9 +123,8 @@ IN_PROC_BROWSER_TEST_F(
 
   // And check that its styles were affected by the styles that just got loaded.
   bool styles_injected;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send("
       "    document.defaultView.getComputedStyle(document.body, null)."
       "        getPropertyValue('background-color') == 'rgb(255, 0, 0)')",
diff --git a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
index c451f23..f87e3a0 100644
--- a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
+++ b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
@@ -26,9 +26,8 @@ IN_PROC_BROWSER_TEST_F(CalculatorBrowserTest, Model) {
   ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_file));
 
   bool success;
-  bool executed = content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  bool executed = content::ExecuteScriptAndExtractBool(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(window.runTests().success)",
       &success);
 
diff --git a/chrome/browser/extensions/extension_bindings_apitest.cc b/chrome/browser/extensions/extension_bindings_apitest.cc
index 75d2aeb..4a017e6 100644
--- a/chrome/browser/extensions/extension_bindings_apitest.cc
+++ b/chrome/browser/extensions/extension_bindings_apitest.cc
@@ -31,7 +31,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, LastError) {
   extensions::ExtensionHost* host = FindHostWithPath(manager, "/bg.html", 1);
 
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      host->render_view_host(), "", "testLastError()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      host->render_view_host(), "testLastError()", &result));
   EXPECT_TRUE(result);
 }
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 7c772f4..f7aba19 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -552,10 +552,8 @@ void ExtensionBrowserTest::OpenWindow(content::WebContents* contents,
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      contents->GetRenderViewHost(),
-      "",
-      "window.open('" + url.spec() + "');"));
+  ASSERT_TRUE(content::ExecuteScript(contents,
+                                     "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,9 +579,8 @@ void ExtensionBrowserTest::NavigateInRenderer(content::WebContents* contents,
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      contents,
       "window.addEventListener('unload', function() {"
       "    window.domAutomationController.send(true);"
       "}, false);"
diff --git a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc
index da8aa3c..0226387 100644
--- a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc
+++ b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc
@@ -67,9 +67,8 @@ bool ClipboardApiTest::ExecutePasteInSelectedTab(bool* result) {
 
 bool ClipboardApiTest::ExecuteScriptInSelectedTab(const std::string& script,
                                                   bool* result) {
-  if (!content::ExecuteJavaScriptAndExtractBool(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+  if (!content::ExecuteScriptAndExtractBool(
+          chrome::GetActiveWebContents(browser()),
           script,
           result)) {
     message_ = "Failed to execute script in selected tab.";
diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc
index e5d4ff0..24b5df0 100644
--- a/chrome/browser/extensions/extension_icon_source_apitest.cc
+++ b/chrome/browser/extensions/extension_icon_source_apitest.cc
@@ -34,9 +34,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) {
   ui_test_utils::NavigateToURL(
       browser(),
       GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html"));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ(result, "Loaded");
@@ -46,9 +45,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) {
   ui_test_utils::NavigateToURL(
       browser(),
       GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html"));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ(result, "Not Loaded");
@@ -67,9 +65,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) {
   Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
       browser()->profile(),
       GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html"));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(otr_browser),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ(result, "Loaded");
@@ -79,9 +76,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) {
   ui_test_utils::OpenURLOffTheRecord(
       browser()->profile(),
       GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html"));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(otr_browser),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ(result, "Not Loaded");
diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc
index df2b400..917dbb1c 100644
--- a/chrome/browser/extensions/extension_incognito_apitest.cc
+++ b/chrome/browser/extensions/extension_incognito_apitest.cc
@@ -36,9 +36,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoNoScript) {
 
   // Verify the script didn't run.
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab,
       "window.domAutomationController.send(document.title == 'Unmodified')",
       &result));
   EXPECT_TRUE(result);
@@ -72,9 +71,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoYesScript) {
 
   // Verify the script ran.
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab,
       "window.domAutomationController.send(document.title == 'modified')",
       &result));
   EXPECT_TRUE(result);
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index 32ed8a0..fa72cb4 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -89,9 +89,8 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) {
 
   // Verify the command worked.
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab,
       "setInterval(function(){"
       "  if(document.body.bgColor == 'red'){"
       "    window.domAutomationController.send(true)}}, 100)",
@@ -103,9 +102,8 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) {
       browser(), ui::VKEY_Y, true, true, false, false));
 
   result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab,
       "setInterval(function(){"
       "  if(document.body.bgColor == 'blue'){"
       "    window.domAutomationController.send(true)}}, 100)",
@@ -151,9 +149,8 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_PageAction) {
   // Verify the command worked (the page action turns the page red).
   WebContents* tab = chrome::GetActiveWebContents(browser());
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab,
       "setInterval(function(){"
       "  if(document.body.bgColor == 'red'){"
       "    window.domAutomationController.send(true)}}, 100)",
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 @@ class NaClExtensionTest : public ExtensionBrowserTest {
     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));
 
diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
index 3c63403..28f456a 100644
--- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
+++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
@@ -50,9 +50,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
   ui_test_utils::NavigateToURL(
       browser(), web_resource.ReplaceComponents(make_host_a_com));
   std::string result;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ(result, "Loaded");
@@ -63,9 +62,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
           "files/extensions/api_test/extension_resource_request_policy/"
           "non_existent_extension.html"));
   ui_test_utils::NavigateToURL(browser(), non_existent_extension);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ(result, "Image failed to load");
@@ -78,9 +76,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
                     .AppendASCII("index.html"), &file_source));
   ui_test_utils::NavigateToURL(browser(),
       GURL(std::string("data:text/html;charset=utf-8,") + file_source));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ(result, "Loaded");
@@ -95,9 +92,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
   ui_test_utils::NavigateToURL(
       browser(),
       GURL("chrome-extension://pbkkcbgdkliohhfaeefcijaghglkahja/index.html"));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ(result, "Loaded");
@@ -160,9 +156,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
           "files/extensions/api_test/extension_resource_request_policy/"
           "web_accessible/accessible_resource.html"));
   ui_test_utils::NavigateToURL(browser(), accessible_resource);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("Loaded", result);
@@ -173,9 +168,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
           "web_accessible/xhr_accessible_resource.html"));
   ui_test_utils::NavigateToURL(
       browser(), xhr_accessible_resource);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("XHR completed with status: 200", result);
@@ -186,9 +180,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
           "web_accessible/xhr_inaccessible_resource.html"));
   ui_test_utils::NavigateToURL(
       browser(), xhr_inaccessible_resource);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("XHR failed to load resource", result);
@@ -198,9 +191,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
           "files/extensions/api_test/extension_resource_request_policy/"
           "web_accessible/nonaccessible_resource.html"));
   ui_test_utils::NavigateToURL(browser(), nonaccessible_resource);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("Image failed to load", result);
@@ -210,9 +202,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
           "files/extensions/api_test/extension_resource_request_policy/"
           "web_accessible/nonexistent_resource.html"));
   ui_test_utils::NavigateToURL(browser(), nonexistent_resource);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("Image failed to load", result);
@@ -222,9 +213,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
           "files/extensions/api_test/extension_resource_request_policy/"
           "web_accessible/nonaccessible_chrome_resource_scheme.html"));
   ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("Loading CER:// failed.", result);
@@ -237,9 +227,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
   ui_test_utils::NavigateToURL(browser(), newtab_page);
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(), accessible_newtab_override, 2);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("New Tab Page Loaded Successfully", result);
@@ -258,9 +247,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
           "files/extensions/api_test/extension_resource_request_policy/"
           "web_accessible/accessible_resource_with_csp.html"));
   ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(document.title)",
       &result));
   EXPECT_EQ("Loaded", result);
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index ce09e05..f1984c5 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -126,19 +126,17 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
     ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_file));
 
     bool result = false;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        chrome::GetActiveWebContents(browser()),
         "window.domAutomationController.send("
-        "document.defaultView.getComputedStyle(document.body, null)."
-        "getPropertyValue('background-color') == 'rgb(245, 245, 220)')",
+        "    document.defaultView.getComputedStyle(document.body, null)."
+        "    getPropertyValue('background-color') == 'rgb(245, 245, 220)')",
         &result));
     EXPECT_EQ(expect_css, result);
 
     result = false;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        chrome::GetActiveWebContents(browser()),
         "window.domAutomationController.send(document.title == 'Modified')",
         &result));
     EXPECT_EQ(expect_script, result);
diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc
index 04460e3..c882a85 100644
--- a/chrome/browser/extensions/isolated_app_browsertest.cc
+++ b/chrome/browser/extensions/isolated_app_browsertest.cc
@@ -22,8 +22,8 @@
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
-using content::ExecuteJavaScript;
-using content::ExecuteJavaScriptAndExtractString;
+using content::ExecuteScript;
+using content::ExecuteScriptAndExtractString;
 using content::NavigationController;
 using content::WebContents;
 using content::RenderViewHost;
@@ -115,7 +115,6 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) {
       NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   WebContents* tab0 = chrome::GetWebContentsAt(browser(), 1);
-  RenderViewHost* rvh = tab0->GetRenderViewHost();
 
   // Using JavaScript to navigate to app2 page,
   // after the non_app page has finished loading.
@@ -126,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) {
   std::string script = base::StringPrintf(
         "document.location.href=\"%s\";",
         base_url.Resolve("app2/main.html").spec().c_str());
-  EXPECT_TRUE(ExecuteJavaScript(rvh, "", script));
+  EXPECT_TRUE(ExecuteScript(tab0, script));
   observer1.Wait();
 
   // This kind of navigation should not replace previous navigation entry.
@@ -178,30 +177,25 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CookieIsolation) {
 
   // Check that tabs see cannot each other's localStorage even though they are
   // in the same origin.
-  RenderViewHost* app1_rvh = tab0->GetRenderViewHost();
-  RenderViewHost* app2_rvh = tab1->GetRenderViewHost();
-  RenderViewHost* non_app_rvh = tab2->GetRenderViewHost();
-  ASSERT_TRUE(ExecuteJavaScript(
-      app1_rvh, "", "window.localStorage.setItem('testdata', 'ls_app1');"));
-  ASSERT_TRUE(ExecuteJavaScript(
-      app2_rvh, "", "window.localStorage.setItem('testdata', 'ls_app2');"));
-  ASSERT_TRUE(ExecuteJavaScript(
-      non_app_rvh,
-      "",
-      "window.localStorage.setItem('testdata', 'ls_normal');"));
+  ASSERT_TRUE(ExecuteScript(
+      tab0, "window.localStorage.setItem('testdata', 'ls_app1');"));
+  ASSERT_TRUE(ExecuteScript(
+      tab1, "window.localStorage.setItem('testdata', 'ls_app2');"));
+  ASSERT_TRUE(ExecuteScript(
+      tab2, "window.localStorage.setItem('testdata', 'ls_normal');"));
 
   const std::string& kRetrieveLocalStorage =
       WrapForJavascriptAndExtract(
           "window.localStorage.getItem('testdata') || 'badval'");
   std::string result;
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app1_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      tab0, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_app1", result);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app2_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      tab1, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_app2", result);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      non_app_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      tab2, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
 
   // Check that each tab sees its own cookie.
@@ -281,32 +275,27 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_NoCookieIsolationWithoutApp) {
 
   // Check that all tabs share the same localStorage if they have the same
   // origin.
-  RenderViewHost* app1_rvh =
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost();
-  RenderViewHost* app2_rvh =
-      chrome::GetWebContentsAt(browser(), 1)->GetRenderViewHost();
-  RenderViewHost* non_app_rvh =
-      chrome::GetWebContentsAt(browser(), 2)->GetRenderViewHost();
-  ASSERT_TRUE(ExecuteJavaScript(
-      app1_rvh, "", "window.localStorage.setItem('testdata', 'ls_app1');"));
-  ASSERT_TRUE(ExecuteJavaScript(
-      app2_rvh, "", "window.localStorage.setItem('testdata', 'ls_app2');"));
-  ASSERT_TRUE(ExecuteJavaScript(
-      non_app_rvh,
-      "",
-      "window.localStorage.setItem('testdata', 'ls_normal');"));
+  WebContents* app1_wc = chrome::GetWebContentsAt(browser(), 0);
+  WebContents* app2_wc = chrome::GetWebContentsAt(browser(), 1);
+  WebContents* non_app_wc = chrome::GetWebContentsAt(browser(), 2);
+  ASSERT_TRUE(ExecuteScript(
+      app1_wc, "window.localStorage.setItem('testdata', 'ls_app1');"));
+  ASSERT_TRUE(ExecuteScript(
+      app2_wc, "window.localStorage.setItem('testdata', 'ls_app2');"));
+  ASSERT_TRUE(ExecuteScript(
+      non_app_wc, "window.localStorage.setItem('testdata', 'ls_normal');"));
 
   const std::string& kRetrieveLocalStorage =
       WrapForJavascriptAndExtract("window.localStorage.getItem('testdata')");
   std::string result;
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app1_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      app1_wc, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app2_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      app2_wc, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      non_app_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      non_app_wc, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
 }
 
@@ -454,25 +443,22 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_SessionStorage) {
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app1/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScript(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScript(
+      chrome::GetWebContentsAt(browser(), 0),
       "window.sessionStorage.setItem('testdata', 'ss_app1');"));
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app2/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScript(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScript(
+      chrome::GetWebContentsAt(browser(), 0),
       "window.sessionStorage.setItem('testdata', 'ss_app2');"));
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScript(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScript(
+      chrome::GetWebContentsAt(browser(), 0),
       "window.sessionStorage.setItem('testdata', 'ss_normal');"));
 
   // Now, ensure that the sessionStorage is correctly partitioned, and persists
@@ -484,24 +470,24 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_SessionStorage) {
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app1/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
+      kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_app1", result);
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app2/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
+      kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_app2", result);
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
+      kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_normal", result);
 }
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index db0c2a9..a64f763 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -255,8 +255,8 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForRequest) {
 
   // Abort the request.
   bool result = false;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      host->render_view_host(), "", "abortRequest()", &result));
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      host->render_view_host(), "abortRequest()", &result));
   EXPECT_TRUE(result);
   page_complete.Wait();
 
diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc
index a62f03c..7dd25c6 100644
--- a/chrome/browser/extensions/options_page_apitest.cc
+++ b/chrome/browser/extensions/options_page_apitest.cc
@@ -40,10 +40,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_OptionsPage) {
   // Go to the Extension Settings page and click the Options button.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIExtensionsURL));
   TabStripModel* tab_strip = browser()->tab_strip_model();
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      tab_strip->GetActiveWebContents()->GetRenderViewHost(),
-      "",
-      kScriptClickOptionButton));
+  ASSERT_TRUE(content::ExecuteScript(tab_strip->GetActiveWebContents(),
+                                     kScriptClickOptionButton));
 
   // If the options page hasn't already come up, wait for it.
   if (tab_strip->count() == 1) {
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc
index 7ea3847..28d7f60 100644
--- a/chrome/browser/extensions/plugin_apitest.cc
+++ b/chrome/browser/extensions/plugin_apitest.cc
@@ -47,8 +47,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
 
   // With no extensions, the plugin should not be loaded.
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), "", "testPluginWorks()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab, "testPluginWorks()", &result));
   EXPECT_FALSE(result);
 
   ExtensionService* service = extensions::ExtensionSystem::Get(
@@ -59,8 +59,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
   ASSERT_TRUE(extension);
   EXPECT_EQ(size_before + 1, service->extensions()->size());
   // Now the plugin should be in the cache.
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), "", "testPluginWorks()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab, "testPluginWorks()", &result));
   // We don't allow extension plugins to run on ChromeOS.
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(result);
@@ -74,8 +74,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
 
   // Now the plugin should be unloaded, and the page should be broken.
 
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), "", "testPluginWorks()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab, "testPluginWorks()", &result));
   EXPECT_FALSE(result);
 
   // If we reload the extension and page, it should work again.
@@ -90,8 +90,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
     chrome::Reload(browser(), CURRENT_TAB);
     observer.Wait();
   }
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), "", "testPluginWorks()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab, "testPluginWorks()", &result));
   // We don't allow extension plugins to run on ChromeOS.
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(result);
@@ -124,8 +124,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) {
       extension->GetResourceURL("test.html"));
   WebContents* tab = chrome::GetActiveWebContents(browser());
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), "", "testPluginWorks()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab, "testPluginWorks()", &result));
   // We don't allow extension plugins to run on ChromeOS.
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(result);
@@ -141,8 +141,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) {
   // loaded even if content settings are set to block plug-ins.
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), "", "testPluginWorks()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab, "testPluginWorks()", &result));
   // We don't allow extension plugins to run on ChromeOS.
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(result);
@@ -153,7 +153,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) {
   // Now load it through a file URL. The plugin should not load.
   ui_test_utils::NavigateToURL(browser(),
       net::FilePathToFileURL(extension_dir.AppendASCII("test.html")));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), "", "testPluginWorks()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab, "testPluginWorks()", &result));
   EXPECT_FALSE(result);
 }
diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc
index a1f6204..2c21944 100644
--- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc
+++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc
@@ -77,17 +77,15 @@ GURL GetFeedUrl(net::TestServer* server, const std::string& feed_page,
 }
 
 bool ValidatePageElement(WebContents* tab,
-                         const std::string& frame,
+                         const std::string& frame_xpath,
                          const std::string& javascript,
                          const std::string& expected_value) {
   std::string returned_value;
   std::string error;
 
-  if (!content::ExecuteJavaScriptAndExtractString(
-          tab->GetRenderViewHost(),
-          frame,
-          javascript,
-          &returned_value))
+  if (!content::ExecuteScriptInFrameAndExtractString(tab, frame_xpath,
+                                                     javascript,
+                                                     &returned_value))
     return false;
 
   EXPECT_STREQ(expected_value.c_str(), returned_value.c_str());
diff --git a/chrome/browser/extensions/web_contents_browsertest.cc b/chrome/browser/extensions/web_contents_browsertest.cc
index 04b4357..b8cd295 100644
--- a/chrome/browser/extensions/web_contents_browsertest.cc
+++ b/chrome/browser/extensions/web_contents_browsertest.cc
@@ -21,9 +21,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) {
       GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html"));
 
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      chrome::GetActiveWebContents(browser()),
       "testTabsAPI()",
       &result));
   EXPECT_TRUE(result);
@@ -35,9 +34,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) {
       browser(),
       GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html"));
   result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      chrome::GetActiveWebContents(browser()),
       "testTabsAPI()",
       &result));
   EXPECT_TRUE(result);
diff --git a/chrome/browser/extensions/web_view_browsertest.cc b/chrome/browser/extensions/web_view_browsertest.cc
index cf39575..138d4ed 100644
--- a/chrome/browser/extensions/web_view_browsertest.cc
+++ b/chrome/browser/extensions/web_view_browsertest.cc
@@ -198,8 +198,7 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
 
     content::TitleWatcher title_watcher(web_contents, expected_title);
     title_watcher.AlsoWaitForTitle(error_title);
-    EXPECT_TRUE(content::ExecuteJavaScript(web_contents->GetRenderViewHost(),
-                                           "", script));
+    EXPECT_TRUE(content::ExecuteScript(web_contents, script));
     EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
   }
 };
@@ -248,10 +247,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, CookieIsolation) {
                                  &cookie_contents2, &named_partition_contents1,
                                  &named_partition_contents2, NULL, NULL, NULL);
 
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      cookie_contents1->GetRenderViewHost(), "", cookie_script1));
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      cookie_contents2->GetRenderViewHost(), "", cookie_script2));
+  EXPECT_TRUE(content::ExecuteScript(cookie_contents1, cookie_script1));
+  EXPECT_TRUE(content::ExecuteScript(cookie_contents2, cookie_script2));
 
   int cookie_size;
   std::string cookie_value;
@@ -320,26 +317,17 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, PRE_StoragePersistence) {
                                  &persistent_partition_contents3);
 
   // Set the inmemory=true cookie for tags with inmemory partitions.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      cookie_contents1->GetRenderViewHost(),
-      "",
-      cookie_script1));
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      named_partition_contents1->GetRenderViewHost(),
-      "",
-      cookie_script1));
+  EXPECT_TRUE(content::ExecuteScript(cookie_contents1, cookie_script1));
+  EXPECT_TRUE(content::ExecuteScript(named_partition_contents1,
+                                     cookie_script1));
 
   // For the two different persistent storage partitions, set the
   // two different cookies so we can check that they aren't comingled below.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      persistent_partition_contents1->GetRenderViewHost(),
-      "",
-      cookie_script2));
+  EXPECT_TRUE(content::ExecuteScript(persistent_partition_contents1,
+                                     cookie_script2));
 
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      persistent_partition_contents3->GetRenderViewHost(),
-      "",
-      cookie_script3));
+  EXPECT_TRUE(content::ExecuteScript(persistent_partition_contents3,
+                                     cookie_script3));
 
   int cookie_size;
   std::string cookie_value;
@@ -463,88 +451,66 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, DOMStorageIsolation) {
 
   // Initialize the storage for the first of the two tags that share a storage
   // partition.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      "initDomStorage('page1')"));
+  EXPECT_TRUE(content::ExecuteScript(storage_contents1,
+                                     "initDomStorage('page1')"));
 
   // Let's test that the expected values are present in the first tag, as they
   // will be overwritten once we call the initDomStorage on the second tag.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_local_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_local_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("local-page1", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_session_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_session_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("session-page1", output.c_str());
 
   // Now, init the storage in the second tag in the same storage partition,
   // which will overwrite the shared localStorage.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      "initDomStorage('page2')"));
+  EXPECT_TRUE(content::ExecuteScript(storage_contents2,
+                                     "initDomStorage('page2')"));
 
   // The localStorage value now should reflect the one written through the
   // second tag.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_local_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_local_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("local-page2", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      get_local_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents2,
+                                            get_local_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("local-page2", output.c_str());
 
   // Session storage is not shared though, as each webview tag has separate
   // instance, even if they are in the same storage partition.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_session_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_session_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("session-page1", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      get_session_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents2,
+                                            get_session_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("session-page2", output.c_str());
 
   // Also, let's check that the main browser and another tag that doesn't share
   // the same partition don't have those values stored.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
       get_local_storage.c_str(),
       &output));
   EXPECT_STREQ("badval", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
       get_session_storage.c_str(),
       &output));
   EXPECT_STREQ("badval", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      default_tag_contents1->GetRenderViewHost(),
-      "",
-      get_local_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(default_tag_contents1,
+                                            get_local_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("badval", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      default_tag_contents1->GetRenderViewHost(),
-      "",
-      get_session_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(default_tag_contents1,
+                                            get_session_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("badval", output.c_str());
 }
 
@@ -576,10 +542,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) {
   std::string get_value(
       "window.domAutomationController.send(getValueIDB() || 'badval')");
 
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_value.c_str(), &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_value.c_str(), &output));
   EXPECT_STREQ("page1", output.c_str());
 
   // Initialize the db in the second tag.
@@ -589,10 +553,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) {
   // one.
   ExecuteScriptWaitForTitle(storage_contents2, "readItemIDB(7)",
                             "readItemIDB complete");
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      get_value.c_str(), &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents2,
+                                            get_value.c_str(), &output));
   EXPECT_STREQ("page1", output.c_str());
 
   // Now write through the second tag and read it back.
@@ -600,27 +562,20 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) {
                             "addItemIDB complete");
   ExecuteScriptWaitForTitle(storage_contents2, "readItemIDB(7)",
                             "readItemIDB complete");
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      get_value.c_str(), &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents2,
+                                            get_value.c_str(), &output));
   EXPECT_STREQ("page2", output.c_str());
 
   // Reset the document title, otherwise the next call will not see a change and
   // will hang waiting for it.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      "document.title = 'foo'"));
+  EXPECT_TRUE(content::ExecuteScript(storage_contents1,
+                                     "document.title = 'foo'"));
 
   // Read through the first tag to ensure we have the second value.
   ExecuteScriptWaitForTitle(storage_contents1, "readItemIDB(7)",
                             "readItemIDB complete");
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_value.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_value.c_str(), &output));
   EXPECT_STREQ("page2", output.c_str());
 
   // Now, let's confirm there is no database in the main browser and another
diff --git a/chrome/browser/extensions/webstore_standalone_install_browsertest.cc b/chrome/browser/extensions/webstore_standalone_install_browsertest.cc
index 4b7296a..4a4e457 100644
--- a/chrome/browser/extensions/webstore_standalone_install_browsertest.cc
+++ b/chrome/browser/extensions/webstore_standalone_install_browsertest.cc
@@ -84,9 +84,8 @@ class WebstoreStandaloneInstallTest : public InProcessBrowserTest {
     bool result = false;
     std::string script = StringPrintf("%s('%s')", test_function_name.c_str(),
         test_gallery_url_.c_str());
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        chrome::GetActiveWebContents(browser()),
         script,
         &result));
     EXPECT_TRUE(result);
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index f2d77fb..1c8a406 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -391,8 +391,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) {
                           start_url.Resolve("newtab.html"), true, &newtab));
 
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      newtab->GetRenderViewHost(), "", "testExtensionApi()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()",
+                                                   &result));
   EXPECT_TRUE(result);
 }
 
@@ -428,7 +428,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) {
 
   // Extension API should succeed.
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      newtab->GetRenderViewHost(), "", "testExtensionApi()", &result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()",
+                                                   &result));
   EXPECT_TRUE(result);
 }
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 1269471..3bfe571 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -69,9 +69,8 @@ class IFrameLoader : public content::NotificationObserver {
     script = base::StringPrintf(
         "window.domAutomationController.send(getIFrameSrc(%d))", iframe_id);
     std::string iframe_src;
-    EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetActiveWebContents(browser)->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+        chrome::GetActiveWebContents(browser),
         script,
         &iframe_src));
     iframe_url_ = GURL(iframe_src);
@@ -329,8 +328,8 @@ class GeolocationBrowserTest : public InProcessBrowserTest {
     std::string script = base::StringPrintf(
         "window.domAutomationController.send(%s)", function.c_str());
     std::string result;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        web_contents->GetRenderViewHost(),
+    ASSERT_TRUE(content::ExecuteScriptInFrameAndExtractString(
+        web_contents,
         iframe_xpath_,
         script,
         &result));
@@ -612,9 +611,8 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) {
       "window.domAutomationController.send(geoSetFinalPosition(%f, %f))",
       final_position_latitude, final_position_longitude);
   std::string js_result;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(current_browser_),
       script,
       &js_result));
   EXPECT_EQ(js_result, "ok");
@@ -652,9 +650,8 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TabDestroyed) {
   std::string script =
       "window.domAutomationController.send(window.close());";
   bool result =
-      content::ExecuteJavaScript(
-          chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(),
-          "",
+      content::ExecuteScript(
+          chrome::GetActiveWebContents(current_browser_),
           script);
   EXPECT_EQ(result, true);
 }
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index 340ace4..90ab904 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -458,10 +458,8 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SubmitFormAddsTargetPage) {
   string16 expected_title(ASCIIToUTF16("Target Page"));
   content::TitleWatcher title_watcher(
       chrome::GetActiveWebContents(browser()), expected_title);
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      web_contents->GetRenderViewHost(),
-      "",
-      "document.getElementById('form').submit()"));
+  ASSERT_TRUE(content::ExecuteScript(
+      web_contents, "document.getElementById('form').submit()"));
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
   std::vector<GURL> urls(GetHistoryContents());
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 90ec7a3..1f57491 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -137,23 +137,21 @@ class InstantTest : public InProcessBrowserTest {
   bool GetBoolFromJS(content::RenderViewHost* rvh,
                      const std::string& script,
                      bool* result) WARN_UNUSED_RESULT {
-    return content::ExecuteJavaScriptAndExtractBool(rvh, "", WrapScript(script),
-                                                    result);
+    return content::ExecuteScriptAndExtractBool(rvh, WrapScript(script),
+                                                result);
   }
 
   bool GetIntFromJS(content::RenderViewHost* rvh,
                     const std::string& script,
                     int* result) WARN_UNUSED_RESULT {
-    return content::ExecuteJavaScriptAndExtractInt(rvh, "", WrapScript(script),
-                                                   result);
+    return content::ExecuteScriptAndExtractInt(rvh, WrapScript(script), result);
   }
 
   bool GetStringFromJS(content::RenderViewHost* rvh,
                        const std::string& script,
                        std::string* result) WARN_UNUSED_RESULT {
-    return content::ExecuteJavaScriptAndExtractString(rvh, "",
-                                                      WrapScript(script),
-                                                      result);
+    return content::ExecuteScriptAndExtractString(rvh, WrapScript(script),
+                                                  result);
   }
 
   bool UpdateSearchState(content::WebContents* contents) WARN_UNUSED_RESULT {
@@ -169,10 +167,8 @@ class InstantTest : public InProcessBrowserTest {
   }
 
   bool ExecuteScript(const std::string& script) WARN_UNUSED_RESULT {
-    return content::ExecuteJavaScript(
-        instant()->GetPreviewContents()->GetRenderViewHost(),
-        "",
-        script);
+    return content::ExecuteScript(
+        instant()->GetPreviewContents()->GetRenderViewHost(), script);
   }
 
   bool CheckVisibilityIs(content::WebContents* contents,
diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
index a53f5cf..1603f70 100644
--- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc
+++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
@@ -18,11 +18,9 @@ class LoadtimesExtensionBindingsTest : public InProcessBrowserTest {
     // TODO(simonjam): There's a race on whether or not first paint is populated
     // before we read them. We ought to test that too. Until the race is fixed,
     // zero it out so the test is stable.
-    content::RenderViewHost* rvh =
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost();
-    ASSERT_TRUE(content::ExecuteJavaScript(
-        rvh,
-        "",
+    content::WebContents* contents = chrome::GetActiveWebContents(browser());
+    ASSERT_TRUE(content::ExecuteScript(
+        contents,
         "window.before.firstPaintAfterLoadTime = 0;"
         "window.before.firstPaintTime = 0;"
         "window.after.firstPaintAfterLoadTime = 0;"
@@ -30,15 +28,13 @@ class LoadtimesExtensionBindingsTest : public InProcessBrowserTest {
 
     std::string before;
     std::string after;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        rvh,
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        contents,
         "window.domAutomationController.send("
         "    JSON.stringify(before))",
         &before));
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        rvh,
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        contents,
         "window.domAutomationController.send("
         "    JSON.stringify(after))",
         &after));
@@ -51,14 +47,13 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
   ASSERT_TRUE(test_server()->Start());
   GURL plain_url = test_server()->GetURL("blank");
   ui_test_utils::NavigateToURL(browser(), plain_url);
-  content::RenderViewHost* rvh =
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost();
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      rvh, "", "window.before = window.chrome.loadTimes()"));
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      rvh, "", "window.location.href = window.location + \"#\""));
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      rvh, "", "window.after = window.chrome.loadTimes()"));
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
+  ASSERT_TRUE(content::ExecuteScript(
+      contents, "window.before = window.chrome.loadTimes()"));
+  ASSERT_TRUE(content::ExecuteScript(
+      contents, "window.location.href = window.location + \"#\""));
+  ASSERT_TRUE(content::ExecuteScript(
+      contents, "window.after = window.chrome.loadTimes()"));
   CompareBeforeAndAfter();
 }
 
@@ -68,12 +63,11 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
   GURL plain_url = test_server()->GetURL("blank");
   GURL hash_url(plain_url.spec() + "#");
   ui_test_utils::NavigateToURL(browser(), plain_url);
-  content::RenderViewHost* rvh =
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost();
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      rvh, "", "window.before = window.chrome.loadTimes()"));
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
+  ASSERT_TRUE(content::ExecuteScript(
+      contents, "window.before = window.chrome.loadTimes()"));
   ui_test_utils::NavigateToURL(browser(), hash_url);
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      rvh, "", "window.after = window.chrome.loadTimes()"));
+  ASSERT_TRUE(content::ExecuteScript(
+      contents, "window.after = window.chrome.loadTimes()"));
   CompareBeforeAndAfter();
 }
diff --git a/chrome/browser/net/load_timing_observer_browsertest.cc b/chrome/browser/net/load_timing_observer_browsertest.cc
index b97a706..3d143dd 100644
--- a/chrome/browser/net/load_timing_observer_browsertest.cc
+++ b/chrome/browser/net/load_timing_observer_browsertest.cc
@@ -26,18 +26,15 @@ IN_PROC_BROWSER_TEST_F(LoadTimingObserverTest, DISABLED_CacheHitAfterRedirect) {
 
   int response_start = 0;
   int response_end = 0;
-  content::RenderViewHost* render_view_host =
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost();
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
-      render_view_host,
-      "",
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
+  ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
+      contents,
       "window.domAutomationController.send("
       "    window.performance.timing.responseStart - "
       "    window.performance.timing.navigationStart)",
       &response_start));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
-      render_view_host,
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
+      contents,
       "window.domAutomationController.send("
       "    window.performance.timing.responseEnd - "
       "    window.performance.timing.navigationStart)",
diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc
index f4c6471..e1f800a 100644
--- a/chrome/browser/notifications/notification_browsertest.cc
+++ b/chrome/browser/notifications/notification_browsertest.cc
@@ -272,9 +272,8 @@ std::string NotificationsTest::CreateNotification(
 
   NotificationBalloonChangeObserver observer;
   std::string result;
-  bool success = content::ExecuteJavaScriptAndExtractString(
-      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
-      "",
+  bool success = content::ExecuteScriptAndExtractString(
+      browser->tab_strip_model()->GetActiveWebContents(),
       script,
       &result);
   if (success && result != "-1" && wait_for_new_balloon)
@@ -299,9 +298,8 @@ bool NotificationsTest::RequestPermissionAndWait(Browser* browser) {
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::Source<InfoBarService>(infobar_service));
   std::string result;
-  bool success = content::ExecuteJavaScriptAndExtractString(
-      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
-      "",
+  bool success = content::ExecuteScriptAndExtractString(
+      browser->tab_strip_model()->GetActiveWebContents(),
       "requestPermission();",
       &result);
   if (!success || result != "1")
@@ -319,9 +317,8 @@ bool NotificationsTest::CancelNotification(
 
   NotificationBalloonChangeObserver observer;
   std::string result;
-  bool success = content::ExecuteJavaScriptAndExtractString(
-      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
-      "",
+  bool success = content::ExecuteScriptAndExtractString(
+      browser->tab_strip_model()->GetActiveWebContents(),
       script,
       &result);
   if (!success || result != "1")
@@ -412,9 +409,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestUserGestureInfobar) {
   // Request permission by calling request() while eval'ing an inline script;
   // That's considered a user gesture to webkit, and should produce an infobar.
   bool result;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send(request());",
       &result));
   EXPECT_TRUE(result);
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 1bec8bd..ee50acd 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -235,9 +235,8 @@ void CheckURLIsBlocked(Browser* browser, const char* spec) {
   // Verify that the expected error page is being displayed.
   // (error 138 == NETWORK_ACCESS_DENIED)
   bool result = false;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      contents,
       "var hasError = false;"
       "var error = document.getElementById('errorDetails');"
       "if (error)"
@@ -289,9 +288,8 @@ int CountScreenshots() {
 // Checks if WebGL is enabled in the given WebContents.
 bool IsWebGLEnabled(content::WebContents* contents) {
   bool result = false;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      contents,
       "var canvas = document.createElement('canvas');"
       "var context = canvas.getContext('experimental-webgl');"
       "domAutomationController.send(context != null);",
@@ -460,9 +458,8 @@ class PolicyTest : public InProcessBrowserTest {
     // (setupCurrentScreenshot is replaced with our hook) or after it has
     // completed (in that case send result immediately).
     bool result = false;
-    EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        web_contents->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+        web_contents,
         "function btest_initCompleted(url) {"
         "  var img = new Image();"
         "  img.src = url;"
@@ -1723,9 +1720,8 @@ IN_PROC_BROWSER_TEST_F(PolicyStatisticsCollectorTest, Startup) {
   ui_test_utils::NavigateToURL(browser(), kAboutHistograms);
   content::WebContents* contents = chrome::GetActiveWebContents(browser());
   std::string text;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      contents,
       "var nodes = document.querySelectorAll('body > pre');"
       "var result = '';"
       "for (var i = 0; i < nodes.length; ++i) {"
diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc
index 60e3105..91f7834 100644
--- a/chrome/browser/policy/policy_prefs_browsertest.cc
+++ b/chrome/browser/policy/policy_prefs_browsertest.cc
@@ -331,8 +331,8 @@ void VerifyControlledSettingIndicators(Browser* browser,
   std::string json;
   // Retrieve the state of all controlled setting indicators matching the
   // |selector| as JSON.
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      contents->GetRenderViewHost(), "", javascript.str(), &json));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents, javascript.str(),
+                                                     &json));
   scoped_ptr<base::Value> value_ptr(base::JSONReader::Read(json));
   const base::ListValue* indicators = NULL;
   ASSERT_TRUE(value_ptr.get());
@@ -491,9 +491,8 @@ IN_PROC_BROWSER_TEST_P(PolicyPrefsTest, CheckPolicyIndicators) {
 
     ui_test_utils::NavigateToURL(browser(), GURL(kMainSettingsPage));
     if (!(*pref_mapping)->indicator_test_setup_js().empty()) {
-      ASSERT_TRUE(content::ExecuteJavaScript(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      ASSERT_TRUE(content::ExecuteScript(
+          chrome::GetActiveWebContents(browser()),
           (*pref_mapping)->indicator_test_setup_js()));
     }
 
diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc
index 8b931b5..7138a7f 100644
--- a/chrome/browser/popup_blocker_browsertest.cc
+++ b/chrome/browser/popup_blocker_browsertest.cc
@@ -54,7 +54,7 @@ class PopupBlockerBrowserTest : public InProcessBrowserTest {
     // Do a round trip to the renderer first to flush any in-flight IPCs to
     // create a to-be-blocked window.
     WebContents* tab = chrome::GetActiveWebContents(browser);
-    CHECK(content::ExecuteJavaScript(tab->GetRenderViewHost(), "", ""));
+    CHECK(content::ExecuteScript(tab, ""));
     BlockedContentTabHelper* blocked_content_tab_helper =
         BlockedContentTabHelper::FromWebContents(tab);
     std::vector<WebContents*> blocked_contents;
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 8b5ac62..fa0ac45 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -782,9 +782,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
     chrome::GoBack(current_browser(), CURRENT_TAB);
     back_nav_observer.Wait();
     bool original_prerender_page = false;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        chrome::GetActiveWebContents(current_browser()),
         "window.domAutomationController.send(IsOriginalPrerenderPage())",
         &original_prerender_page));
     EXPECT_TRUE(original_prerender_page);
@@ -803,9 +802,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
     chrome::GoBack(current_browser(), CURRENT_TAB);
     back_nav_observer.Wait();
     bool js_result;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        tab->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        tab,
         "window.domAutomationController.send(DidBackToOriginalPagePass())",
         &js_result));
     EXPECT_TRUE(js_result);
@@ -856,9 +854,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
         "window.domAutomationController.send(Boolean("
             "receivedPrerenderStartEvents[%d]))", index);
 
-    CHECK(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
-        "",
+    CHECK(content::ExecuteScriptAndExtractBool(
+        chrome::GetActiveWebContents(current_browser()),
         expression,
         &received_prerender_started));
     return received_prerender_started;
@@ -870,9 +867,9 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
         "window.domAutomationController.send(Boolean("
             "receivedPrerenderLoadEvents[%d]))", index);
 
-    CHECK(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
-        "", expression,
+    CHECK(content::ExecuteScriptAndExtractBool(
+        chrome::GetActiveWebContents(current_browser()),
+        expression,
         &received_prerender_loaded));
     return received_prerender_loaded;
   }
@@ -883,9 +880,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
         "window.domAutomationController.send(Boolean("
             "receivedPrerenderStopEvents[%d]))", index);
 
-    CHECK(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
-        "",
+    CHECK(content::ExecuteScriptAndExtractBool(
+        chrome::GetActiveWebContents(current_browser()),
         expression,
         &received_prerender_stopped));
     return received_prerender_stopped;
@@ -893,10 +889,11 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
 
   bool HadPrerenderEventErrors() const {
     bool had_prerender_event_errors;
-    CHECK(content::ExecuteJavaScriptAndExtractBool(
-        chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
-        "", "window.domAutomationController.send(Boolean("
-            "hadPrerenderEventErrors))", &had_prerender_event_errors));
+    CHECK(content::ExecuteScriptAndExtractBool(
+        chrome::GetActiveWebContents(current_browser()),
+        "window.domAutomationController.send(Boolean("
+        "    hadPrerenderEventErrors))",
+        &had_prerender_event_errors));
     return had_prerender_event_errors;
   }
 
@@ -1059,9 +1056,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
 
         // Check if page behaves as expected while in prerendered state.
         bool prerender_test_result = false;
-        ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+        ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
             prerender_contents->GetRenderViewHostMutable(),
-            "",
             "window.domAutomationController.send(DidPrerenderPass())",
             &prerender_test_result));
         EXPECT_TRUE(prerender_test_result);
@@ -1118,9 +1114,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
         page_load_observer->Wait();
 
       bool display_test_result = false;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-          web_contents->GetRenderViewHost(),
-          "",
+      ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+          web_contents,
           "window.domAutomationController.send(DidDisplayPass())",
           &display_test_result));
       EXPECT_TRUE(display_test_result);
@@ -1432,9 +1427,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) {
   //                loading.  It would be great if we could avoid that.
   WebContents* web_contents = chrome::GetActiveWebContents(browser());
   bool display_test_result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      web_contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      web_contents,
       "window.domAutomationController.send(DidDisplayPass())",
       &display_test_result));
   EXPECT_TRUE(display_test_result);
@@ -2615,11 +2609,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithNaCl,
   // asynchronously.
   WebContents* web_contents = chrome::GetActiveWebContents(browser());
   bool display_test_result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      web_contents->GetRenderViewHost(),
-      "",
-      "DidDisplayReallyPass()",
-      &display_test_result));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
+                                                   "DidDisplayReallyPass()",
+                                                   &display_test_result));
   ASSERT_TRUE(display_test_result);
 }
 
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 553050c..2560734 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -180,9 +180,8 @@ class SSLUITest : public InProcessBrowserTest {
 
     while (base::Time::Now() < timeToQuit) {
       bool workerFinished = false;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-          tab->GetRenderViewHost(),
-          "",
+      ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+          tab,
           "window.domAutomationController.send(IsWorkerFinished());",
           &workerFinished));
 
@@ -198,9 +197,8 @@ class SSLUITest : public InProcessBrowserTest {
     }
 
     bool actuallyLoadedContent = false;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        tab->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+        tab,
         "window.domAutomationController.send(IsContentLoaded());",
         &actuallyLoadedContent));
     EXPECT_EQ(expectLoaded, actuallyLoadedContent);
@@ -862,9 +860,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContents) {
   EXPECT_EQ(0U, GetConstrainedWindowCount());
 
   int img_width;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractInt(
-      tab->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractInt(
+      tab,
       "window.domAutomationController.send(ImageWidth());",
       &img_width));
   // In order to check that the image was not loaded, we check its width.
@@ -873,9 +870,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContents) {
   EXPECT_LT(img_width, 100);
 
   bool js_result = false;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab,
       "window.domAutomationController.send(IsFooSet());",
       &js_result));
   EXPECT_FALSE(js_result);
@@ -900,9 +896,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentLoadedFromJS) {
 
   // Load the insecure image.
   bool js_result = false;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab,
       "loadBadImage();",
       &js_result));
   EXPECT_TRUE(js_result);
@@ -1304,9 +1299,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&tab->GetController()));
-    EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        tab->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+        tab,
         "window.domAutomationController.send(clickLink('goodHTTPSLink'));",
         &success));
     ASSERT_TRUE(success);
@@ -1321,9 +1315,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&tab->GetController()));
-    EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        tab->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+        tab,
         "window.domAutomationController.send(clickLink('badHTTPSLink'));",
         &success));
     ASSERT_TRUE(success);
@@ -1338,8 +1331,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
   std::string content_frame_xpath("html/frameset/frame[2]");
   std::string is_evil_js("window.domAutomationController.send("
                          "document.getElementById('evilDiv') != null);");
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
+  EXPECT_TRUE(content::ExecuteScriptInFrameAndExtractBool(
+      tab,
       content_frame_xpath,
       is_evil_js,
       &is_content_evil));
@@ -1360,9 +1353,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&tab->GetController()));
-    EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        tab->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+        tab,
         "window.domAutomationController.send(clickLink('HTTPLink'));",
         &success));
     ASSERT_TRUE(success);
@@ -1408,9 +1400,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadFrameNavigation) {
   content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&tab->GetController()));
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      tab,
       "window.domAutomationController.send(clickLink('goodHTTPSLink'));",
       &success));
   ASSERT_TRUE(success);
@@ -1446,9 +1437,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&tab->GetController()));
-    EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        tab->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+        tab,
         "window.domAutomationController.send(clickLink('goodHTTPSLink'));",
         &success));
     ASSERT_TRUE(success);
@@ -1464,9 +1454,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&tab->GetController()));
-    EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-        tab->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+        tab,
         "window.domAutomationController.send(clickLink('badHTTPSLink'));",
         &success));
     ASSERT_TRUE(success);
@@ -1481,8 +1470,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) {
   std::string content_frame_xpath("html/frameset/frame[2]");
   std::string is_evil_js("window.domAutomationController.send("
                          "document.getElementById('evilDiv') != null);");
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(),
+  EXPECT_TRUE(content::ExecuteScriptInFrameAndExtractBool(
+      tab,
       content_frame_xpath,
       is_evil_js,
       &is_content_evil));
diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc
index 32021cd..1236775 100644
--- a/chrome/browser/tab_contents/view_source_browsertest.cc
+++ b/chrome/browser/tab_contents/view_source_browsertest.cc
@@ -103,11 +103,8 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, DISABLED_TestViewSourceReload) {
   ui_test_utils::NavigateToURL(browser(), url_viewsource);
   observer.Wait();
 
-  content::RenderViewHost* rvh =
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost();
-
-  ASSERT_TRUE(
-      content::ExecuteJavaScript(rvh, "", "window.location.reload();"));
+  ASSERT_TRUE(content::ExecuteScript(chrome::GetWebContentsAt(browser(), 0),
+                                     "window.location.reload();"));
 
   content::WindowedNotificationObserver observer2(
       content::NOTIFICATION_LOAD_STOP,
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index f53588e..3f9f689 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -464,9 +464,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest,
   // Activate the first browser.
   focused_browser->window()->Activate();
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(unfocused_browser)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(unfocused_browser),
       "stealFocus();"));
 
   // Make sure the first browser is still active.
@@ -484,9 +483,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {
 
   chrome::FocusLocationBar(browser());
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "stealFocus();"));
 
   // Make sure the location bar is still focused.
@@ -531,9 +529,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) {
       SCOPED_TRACE(base::StringPrintf("inner loop %" PRIuS, j));
       // Let's make sure the focus is on the expected element in the page.
       std::string actual;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           "window.domAutomationController.send(getFocusedElement());",
           &actual));
       ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
@@ -604,9 +601,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) {
 
       // Let's make sure the focus is on the expected element in the page.
       std::string actual;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           "window.domAutomationController.send(getFocusedElement());",
           &actual));
       ASSERT_STREQ(next_element, actual.c_str());
@@ -663,9 +659,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
     for (size_t j = 0; j < 7; ++j) {
       // Let's make sure the focus is on the expected element in the page.
       std::string actual;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      ASSERT_TRUE(content::ExecuteScriptAndExtractString(
           interstitial_page->render_view_host(),
-          "",
           "window.domAutomationController.send(getFocusedElement());",
           &actual));
       ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
@@ -724,9 +719,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
 
       // Let's make sure the focus is on the expected element in the page.
       std::string actual;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      ASSERT_TRUE(content::ExecuteScriptAndExtractString(
           interstitial_page->render_view_host(),
-          "",
           "window.domAutomationController.send(getFocusedElement());",
           &actual));
       ASSERT_STREQ(kExpElementIDs[6 - j], actual.c_str());
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index d30228f..b1cdcc6 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -469,9 +469,8 @@ bool FocusedOnPage(WebContents* web_contents, std::string* result)
     WARN_UNUSED_RESULT;
 
 bool FocusedOnPage(WebContents* web_contents, std::string* result) {
-  return content::ExecuteJavaScriptAndExtractString(
-      web_contents->GetRenderViewHost(),
-      "",
+  return content::ExecuteScriptAndExtractString(
+      web_contents,
       "window.domAutomationController.send(getFocusedElement());",
       result);
 }
@@ -514,9 +513,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) {
   EXPECT_EQ(1, ordinal);
 
   // Move the selection to link 1, after searching.
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      web_contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      web_contents,
       "window.domAutomationController.send(selectLink1());",
       &result));
 
@@ -588,9 +586,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
 
   // Move the selection to link 1, after searching.
   std::string result;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      web_contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      web_contents,
       "window.domAutomationController.send(selectLink1());",
       &result));
 
@@ -618,9 +615,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
 
   // Move the selection to the text span.
   std::string result;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      web_contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      web_contents,
       "window.domAutomationController.send(selectSpan());",
       &result));
 
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 2cf9b77..cdbc11b 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -423,10 +423,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_AutoResize) {
 
   // Expand the test page. The resize will update the docked panel collection.
   WaitForAutoResizeWider enlarge(panel);
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      panel->GetWebContents()->GetRenderViewHost(),
-      "",
-      "changeSize(50);"));
+  EXPECT_TRUE(content::ExecuteScript(
+      panel->GetWebContents(), "changeSize(50);"));
   enlarge.Wait();
   gfx::Rect bounds_on_grow = panel->GetBounds();
   EXPECT_GT(bounds_on_grow.width(), initial_bounds.width());
@@ -434,10 +432,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_AutoResize) {
 
   // Shrink the test page. The resize will update the docked panel collection.
   WaitForAutoResizeNarrower shrink(panel);
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      panel->GetWebContents()->GetRenderViewHost(),
-      "",
-      "changeSize(-30);"));
+  EXPECT_TRUE(content::ExecuteScript(
+      panel->GetWebContents(), "changeSize(-30);"));
   shrink.Wait();
   gfx::Rect bounds_on_shrink = panel->GetBounds();
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());
@@ -1564,9 +1560,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
 
   // Inject some HTML content into the panel.
   WaitForAutoResizeWider enlarge(panel);
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      panel->GetWebContents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScript(
+      panel->GetWebContents(),
       "document.body.innerHTML ="
       "    '<nobr>line of text and a <button>Button</button>';"));
   enlarge.Wait();
diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc
index 41900de4..480d015 100644
--- a/chrome/browser/ui/pdf/pdf_browsertest.cc
+++ b/chrome/browser/ui/pdf/pdf_browsertest.cc
@@ -249,9 +249,8 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Scroll) {
   ASSERT_NO_FATAL_FAILURE(WaitForResponse());
 
   int y_offset = 0;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(plugin.pageYOffset())",
       &y_offset));
   ASSERT_GT(y_offset, 0);
@@ -338,9 +337,8 @@ IN_PROC_BROWSER_TEST_P(PDFBrowserTest, Loading) {
       // doing async loading.  This happens when the first loader is cancelled
       // and before creating a byte-range request loader.
       bool complete = false;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          std::string(),
+      ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+          chrome::GetActiveWebContents(browser()),
           "window.domAutomationController.send(plugin.documentLoadComplete())",
           &complete));
       if (complete)
@@ -362,27 +360,23 @@ INSTANTIATE_TEST_CASE_P(PDFTestFiles,
 IN_PROC_BROWSER_TEST_F(PDFBrowserTest, Action) {
   ASSERT_NO_FATAL_FAILURE(Load());
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "document.getElementsByName('plugin')[0].fitToHeight();"));
 
   std::string zoom1, zoom2;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send("
       "    document.getElementsByName('plugin')[0].getZoomLevel().toString())",
       &zoom1));
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "document.getElementsByName('plugin')[0].fitToWidth();"));
 
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send("
       "    document.getElementsByName('plugin')[0].getZoomLevel().toString())",
       &zoom2));
@@ -400,9 +394,8 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, DISABLED_OnLoadAndReload) {
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "reloadPDF();"));
   observer.Wait();
 
diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
index 310fddd..e46b77a 100644
--- a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
@@ -32,15 +32,13 @@ class BookmarksTest : public InProcessBrowserTest {
   void AssertIsBookmarksPage(content::WebContents* tab) {
     GURL url;
     std::string out;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        tab->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        tab,
         "domAutomationController.send(location.protocol)",
         &out));
     ASSERT_EQ("chrome-extension:", out);
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        tab->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        tab,
         "domAutomationController.send(location.pathname)",
         &out));
     ASSERT_EQ("/main.html", out);
diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc
index 3be9300..ad52ebe6 100644
--- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc
@@ -46,9 +46,8 @@ IN_PROC_BROWSER_TEST_F(InspectUITest, DISABLED_SharedWorkersList) {
 
   std::string result;
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          web_contents->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          web_contents,
           "window.domAutomationController.send("
           "    '' + document.body.textContent);",
           &result));
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
index d9af2ce..9039447 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -33,9 +33,8 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ChromeInternalLoadsNTP) {
   // Ensure that we get there by checking for non-empty page content.
   ui_test_utils::NavigateToURL(browser(), GURL("chrome-internal:"));
   bool empty_inner_html = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      browser()->tab_strip_model()->GetWebContentsAt(0)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      browser()->tab_strip_model()->GetWebContentsAt(0),
       "window.domAutomationController.send(document.body.innerHTML == '')",
       &empty_inner_html));
   ASSERT_FALSE(empty_inner_html);
diff --git a/chrome/browser/ui/webui/options/options_ui_browsertest.cc b/chrome/browser/ui/webui/options/options_ui_browsertest.cc
index cb9027a..8dfd2cb 100644
--- a/chrome/browser/ui/webui/options/options_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/options/options_ui_browsertest.cc
@@ -27,9 +27,8 @@ void OptionsBrowserTest::NavigateToSettings() {
 
 void OptionsBrowserTest::VerifyNavbar() {
   bool navbar_exist = false;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      chrome::GetActiveWebContents(browser()),
       "domAutomationController.send("
       "    !!document.getElementById('navigation'))",
       &navbar_exist));
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
index eb3790a..89a9dec 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
@@ -81,8 +81,7 @@ void PreferencesBrowserTest::SetUpOnMainThread() {
   pref_change_registrar_.Init(
       PrefServiceBase::FromBrowserContext(browser()->profile()));
   pref_service_ = browser()->profile()->GetPrefs();
-  ASSERT_TRUE(content::ExecuteJavaScript(render_view_host_,
-      "",
+  ASSERT_TRUE(content::ExecuteScript(render_view_host_,
       "function TestEnv() {"
       "  this.sentinelName_ = 'download.prompt_for_download';"
       "  this.prefs_ = [];"
@@ -313,8 +312,8 @@ void PreferencesBrowserTest::SetupJavaScriptTestEnvironment(
   std::string temp_observed_json;
   if (!observed_json)
     observed_json = &temp_observed_json;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      render_view_host_, "", javascript.str(), observed_json));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      render_view_host_, javascript.str(), observed_json));
 }
 
 void PreferencesBrowserTest::VerifySetPref(const std::string& name,
@@ -337,8 +336,8 @@ void PreferencesBrowserTest::VerifySetPref(const std::string& name,
              << "      " << value_json.c_str() << ","
              << "      " << commit_json.c_str() << ");});";
   std::string observed_json;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      render_view_host_, "", javascript.str(), &observed_json));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      render_view_host_, javascript.str(), &observed_json));
   VerifyObservedPref(observed_json, name, value, "", false, !commit);
   VerifyAndClearExpectations();
 }
@@ -359,8 +358,8 @@ void PreferencesBrowserTest::VerifyClearPref(const std::string& name,
              << "      '" << name.c_str() << "',"
              << "      " << commit_json.c_str() << ");});";
   std::string observed_json;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      render_view_host_, "", javascript.str(), &observed_json));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      render_view_host_, javascript.str(), &observed_json));
   VerifyObservedPref(observed_json, name, value, "recommended", false, !commit);
   VerifyAndClearExpectations();
 }
@@ -373,8 +372,8 @@ void PreferencesBrowserTest::VerifyCommit(const std::string& name,
              << "    Preferences.getInstance().commitPref("
              << "        '" << name.c_str() << "');});";
   std::string observed_json;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      render_view_host_, "", javascript.str(), &observed_json));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      render_view_host_, javascript.str(), &observed_json));
   VerifyObservedPref(observed_json, name, value, controlledBy, false, false);
 }
 
@@ -401,21 +400,20 @@ void PreferencesBrowserTest::VerifyRollback(const std::string& name,
              << "    Preferences.getInstance().rollbackPref("
              << "        '" << name.c_str() << "');});";
   std::string observed_json;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      render_view_host_, "", javascript.str(), &observed_json));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      render_view_host_, javascript.str(), &observed_json));
   VerifyObservedPref(observed_json, name, value, controlledBy, false, true);
   VerifyAndClearExpectations();
 }
 
 void PreferencesBrowserTest::StartObserving() {
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      render_view_host_, "", "testEnv.startObserving();"));
+  ASSERT_TRUE(content::ExecuteScript(
+      render_view_host_, "testEnv.startObserving();"));
 }
 
 void PreferencesBrowserTest::FinishObserving(std::string* observed_json) {
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       render_view_host_,
-      "",
       "testEnv.finishObservingAndReply();",
       observed_json));
 }
diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
index 2df0d84..89b688f8 100644
--- a/chrome/test/base/tracing_browsertest.cc
+++ b/chrome/test/base/tracing_browsertest.cc
@@ -32,7 +32,7 @@ class TracingBrowserTest : public InProcessBrowserTest {
     content::RenderViewHost* rvh =
         chrome::GetActiveWebContents(browser())->GetRenderViewHost();
     ASSERT_TRUE(rvh);
-    ASSERT_TRUE(content::ExecuteJavaScript(rvh, "", ";"));
+    ASSERT_TRUE(content::ExecuteScript(rvh, ";"));
   }
 };
 
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 3db0e50..745da50 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -566,9 +566,9 @@ class SnapshotTaker {
                               SkBitmap* bitmap) WARN_UNUSED_RESULT {
     const char* script =
         "window.domAutomationController.send("
-            "JSON.stringify([document.width, document.height]))";
+        "    JSON.stringify([document.width, document.height]))";
     std::string json;
-    if (!content::ExecuteJavaScriptAndExtractString(rvh, "", script, &json))
+    if (!content::ExecuteScriptAndExtractString(rvh, script, &json))
       return false;
 
     // Parse the JSON.
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc
index 8b7eb55..21de04f 100644
--- a/chrome/test/gpu/gpu_pixel_browsertest.cc
+++ b/chrome/test/gpu/gpu_pixel_browsertest.cc
@@ -183,10 +183,8 @@ class GpuPixelBrowserTest : public InProcessBrowserTest {
     js_call << new_bounds.width() << ", " << new_bounds.height();
     js_call << ");";
 
-    ASSERT_TRUE(content::ExecuteJavaScript(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        "",
-        js_call.str()));
+    ASSERT_TRUE(content::ExecuteScript(
+        chrome::GetActiveWebContents(browser()), js_call.str()));
 
     std::string message;
     ASSERT_TRUE(message_queue.WaitForMessage(&message));
diff --git a/content/browser/bookmarklet_browsertest.cc b/content/browser/bookmarklet_browsertest.cc
index 81eda413..bfdea1a 100644
--- a/content/browser/bookmarklet_browsertest.cc
+++ b/content/browser/bookmarklet_browsertest.cc
@@ -22,9 +22,8 @@ class BookmarkletTest : public ContentBrowserTest {
 
   std::string GetBodyText() {
     std::string body_text;
-    EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-        shell()->web_contents()->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(ExecuteScriptAndExtractString(
+        shell()->web_contents(),
         "window.domAutomationController.send(document.body.innerText);",
         &body_text));
     return body_text;
diff --git a/content/browser/database_browsertest.cc b/content/browser/database_browsertest.cc
index 0c49cfb..48f7304 100644
--- a/content/browser/database_browsertest.cc
+++ b/content/browser/database_browsertest.cc
@@ -27,9 +27,8 @@ class DatabaseTest : public ContentBrowserTest {
                                const std::string& script,
                                const std::string& result) {
     std::string data;
-    ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-        shell->web_contents()->GetRenderViewHost(),
-        std::string(),
+    ASSERT_TRUE(ExecuteScriptAndExtractString(
+        shell->web_contents(),
         script,
         &data));
     ASSERT_EQ(data, result);
@@ -65,9 +64,8 @@ class DatabaseTest : public ContentBrowserTest {
 
   bool HasTable(Shell* shell) {
     std::string data;
-    CHECK(ExecuteJavaScriptAndExtractString(
-        shell->web_contents()->GetRenderViewHost(),
-        std::string(),
+    CHECK(ExecuteScriptAndExtractString(
+        shell->web_contents(),
         "getRecords()",
         &data));
     return data != "getRecords error: [object SQLError]";
diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc
index 84405f2..3591c67 100644
--- a/content/browser/dom_storage/dom_storage_browsertest.cc
+++ b/content/browser/dom_storage/dom_storage_browsertest.cc
@@ -28,9 +28,8 @@ class DomStorageBrowserTest : public ContentBrowserTest {
     std::string result = the_browser->web_contents()->GetURL().ref();
     if (result != "pass") {
       std::string js_result;
-      ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-          the_browser->web_contents()->GetRenderViewHost(),
-          std::string(),
+      ASSERT_TRUE(ExecuteScriptAndExtractString(
+          the_browser->web_contents(),
           "window.domAutomationController.send(getLog())",
           &js_result));
       FAIL() << "Failed: " << js_result;
diff --git a/content/browser/encrypted_media_browsertest.cc b/content/browser/encrypted_media_browsertest.cc
index 5cd993f..1d32e1d 100644
--- a/content/browser/encrypted_media_browsertest.cc
+++ b/content/browser/encrypted_media_browsertest.cc
@@ -76,9 +76,8 @@ class EncryptedMediaTest : public testing::WithParamInterface<const char*>,
 
     if (final_title == kFailed) {
       std::string fail_message;
-      EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-          shell()->web_contents()->GetRenderViewHost(),
-          std::string(),
+      EXPECT_TRUE(ExecuteScriptAndExtractString(
+          shell()->web_contents(),
           "window.domAutomationController.send(failMessage);",
           &fail_message));
       LOG(INFO) << "Test failed: " << fail_message;
diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc
index e01f08b..29bdbd3 100644
--- a/content/browser/fileapi/file_system_browsertest.cc
+++ b/content/browser/fileapi/file_system_browsertest.cc
@@ -41,9 +41,8 @@ class FileSystemBrowserTest : public ContentBrowserTest {
     std::string result = the_browser->web_contents()->GetURL().ref();
     if (result != "pass") {
       std::string js_result;
-      ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-          the_browser->web_contents()->GetRenderViewHost(),
-          std::string(),
+      ASSERT_TRUE(ExecuteScriptAndExtractString(
+          the_browser->web_contents(),
           "window.domAutomationController.send(getLog())",
           &js_result));
       FAIL() << "Failed: " << js_result;
diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc
index e8f3222..c7ce5e7b 100644
--- a/content/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -49,9 +49,8 @@ class IndexedDBBrowserTest : public ContentBrowserTest {
     std::string result = the_browser->web_contents()->GetURL().ref();
     if (result != "pass") {
       std::string js_result;
-      ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-          the_browser->web_contents()->GetRenderViewHost(),
-          std::string(),
+      ASSERT_TRUE(ExecuteScriptAndExtractString(
+          the_browser->web_contents(),
           "window.domAutomationController.send(getLog())",
           &js_result));
       FAIL() << "Failed: " << js_result;
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
index a9457ea..0257b57 100644
--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -47,10 +47,6 @@ class ResourceDispatcherHostBrowserTest : public ContentBrowserTest,
       got_downloads_ = !!manager->InProgressCount();
   }
 
-  RenderViewHost* render_view_host() {
-    return shell()->web_contents()->GetRenderViewHost();
-  }
-
   GURL GetMockURL(const std::string& file) {
     return URLRequestMockHTTPJob::GetMockUrl(FilePath().AppendASCII(file));
   }
@@ -69,7 +65,7 @@ class ResourceDispatcherHostBrowserTest : public ContentBrowserTest,
     ShellAddedObserver new_shell_observer;
 
     // Create dynamic popup.
-    if (!ExecuteJavaScript(render_view_host(), "", "OpenPopup();"))
+    if (!ExecuteScript(shell()->web_contents(), "OpenPopup();"))
       return false;
 
     Shell* new_shell = new_shell_observer.GetShell();
@@ -165,9 +161,8 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, SyncXMLHttpRequest) {
 
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(DidSyncRequestSucceed());",
       &success));
   EXPECT_TRUE(success);
@@ -183,9 +178,8 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
 
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(DidSucceed());",
       &success));
   EXPECT_TRUE(success);
@@ -346,9 +340,8 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
   std::string redirect_script = "window.location='" +
       test_url.possibly_invalid_spec() + "';" +
       "window.domAutomationController.send(true);";
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       redirect_script,
       &success));
   EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index 32ed998..94b33b0 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -131,9 +131,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
   // Open a same-site link in a new window.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -151,9 +150,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
 
   // We should have access to the opened window's location.
   success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(testScriptAccessToWindow());",
       &success));
   EXPECT_TRUE(success);
@@ -166,9 +164,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
 
   // We should no longer have script access to the opened window's location.
   success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(testScriptAccessToWindow());",
       &success));
   EXPECT_FALSE(success);
@@ -202,9 +199,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Test clicking a rel=noreferrer + target=blank link.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickNoRefTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
@@ -256,9 +252,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Test clicking a same-site rel=noreferrer + target=foo link.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickSameSiteNoRefTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -310,9 +305,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Test clicking a target=blank link.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
@@ -358,9 +352,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Test clicking a rel=noreferrer link.
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickNoRefLink());",
       &success));
   EXPECT_TRUE(success);
@@ -406,9 +399,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Test clicking a target=foo link.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -435,9 +427,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
       NOTIFICATION_NAV_ENTRY_COMMITTED,
       Source<NavigationController>(
           &new_shell->web_contents()->GetController()));
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -456,9 +447,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   WindowedNotificationObserver close_observer(
         NOTIFICATION_WEB_CONTENTS_DESTROYED,
         Source<WebContents>(new_shell->web_contents()));
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(testCloseWindow());",
       &success));
   EXPECT_TRUE(success);
@@ -492,9 +482,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
   // Test clicking a target=_blank link.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickSameSiteTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
@@ -517,10 +506,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
   EXPECT_NE(orig_site_instance, new_site_instance);
 
   // Now disown the opener.
-  EXPECT_TRUE(ExecuteJavaScript(
-      new_shell->web_contents()->GetRenderViewHost(),
-      "",
-      "window.opener = null;"));
+  EXPECT_TRUE(ExecuteScript(new_shell->web_contents(),
+                            "window.opener = null;"));
 
   // Go back and ensure the opener is still null.
   {
@@ -532,9 +519,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
     back_nav_load_observer.Wait();
   }
   success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      new_shell->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      new_shell->web_contents(),
       "window.domAutomationController.send(window.opener == null);",
       &success));
   EXPECT_TRUE(success);
@@ -542,9 +528,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
   // Now navigate forward again (creating a new process) and check opener.
   NavigateToURL(new_shell, https_server.GetURL("files/title1.html"));
   success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      new_shell->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      new_shell->web_contents(),
       "window.domAutomationController.send(window.opener == null);",
       &success));
   EXPECT_TRUE(success);
@@ -592,9 +577,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // First, a named target=foo window.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      opener_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      opener_contents,
       "window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -612,9 +596,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Second, a target=_blank window.
   ShellAddedObserver new_shell_observer2;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickSameSiteTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
@@ -639,11 +622,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // 2) Fail to post a message from the foo window to the opener if the target
   // origin is wrong.  We won't see an error, but we can check for the right
   // number of received messages below.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      foo_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      foo_contents,
       "window.domAutomationController.send(postToOpener('msg',"
-          "'http://google.com'));",
+      "    'http://google.com'));",
       &success));
   EXPECT_TRUE(success);
   ASSERT_FALSE(opener_manager->GetSwappedOutRenderViewHost(orig_site_instance));
@@ -653,9 +635,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   WindowedNotificationObserver title_observer(
       NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
       Source<WebContents>(foo_contents));
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      foo_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      foo_contents,
       "window.domAutomationController.send(postToOpener('msg','*'));",
       &success));
   EXPECT_TRUE(success);
@@ -665,15 +646,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // We should have received only 1 message in the opener and "foo" tabs,
   // and updated the title.
   int opener_received_messages = 0;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractInt(
-      opener_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractInt(
+      opener_contents,
       "window.domAutomationController.send(window.receivedMessages);",
       &opener_received_messages));
   int foo_received_messages = 0;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractInt(
-      foo_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractInt(
+      foo_contents,
       "window.domAutomationController.send(window.receivedMessages);",
       &foo_received_messages));
   EXPECT_EQ(1, foo_received_messages);
@@ -685,9 +664,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   WindowedNotificationObserver title_observer2(
       NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
       Source<WebContents>(foo_contents));
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      new_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      new_contents,
       "window.domAutomationController.send(postToFoo('msg2'));",
       &success));
   EXPECT_TRUE(success);
@@ -731,9 +709,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Test clicking a target=foo link.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      orig_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      orig_contents,
       "window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -760,9 +737,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
       NOTIFICATION_NAV_ENTRY_COMMITTED,
       Source<NavigationController>(
           &orig_contents->GetController()));
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      new_shell->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      new_shell->web_contents(),
       "window.domAutomationController.send(navigateOpener());",
       &success));
   EXPECT_TRUE(success);
@@ -803,9 +779,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Test clicking a target=foo link.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -885,9 +860,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
 
   // Renderer-initiated navigations should work.
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickNoRefLink());",
       &success));
   EXPECT_TRUE(success);
@@ -1045,9 +1019,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Open a same-site link in a new widnow.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -1059,11 +1032,11 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
             new_shell->web_contents()->GetURL().path());
 
   RenderViewHost* rvh = new_shell->web_contents()->GetRenderViewHost();
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
+
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
       rvh,
-      "",
       "window.domAutomationController.send("
-          "document.webkitVisibilityState == 'visible');",
+      "    document.webkitVisibilityState == 'visible');",
       &success));
   EXPECT_TRUE(success);
 
@@ -1071,11 +1044,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // tab's existing RenderView, causing it become hidden.
   NavigateToURL(new_shell, https_server.GetURL("files/title1.html"));
 
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
       rvh,
-      "",
       "window.domAutomationController.send("
-          "document.webkitVisibilityState == 'hidden');",
+      "    document.webkitVisibilityState == 'hidden');",
       &success));
   EXPECT_TRUE(success);
 
@@ -1090,17 +1062,15 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
     back_nav_load_observer.Wait();
   }
 
-
   EXPECT_EQ("/files/navigate_opener.html",
             new_shell->web_contents()->GetURL().path());
 
   EXPECT_EQ(rvh, new_shell->web_contents()->GetRenderViewHost());
 
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
       rvh,
-      "",
       "window.domAutomationController.send("
-          "document.webkitVisibilityState == 'visible');",
+      "    document.webkitVisibilityState == 'visible');",
       &success));
   EXPECT_TRUE(success);
 }
@@ -1268,9 +1238,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
   EXPECT_TRUE(orig_site_instance != NULL);
 
   ShellAddedObserver shell_observer1;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      opener_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      opener_contents,
       "window.domAutomationController.send(openWindow('1-3.html'));",
       &success));
   EXPECT_TRUE(success);
@@ -1290,9 +1259,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
   EXPECT_NE(orig_site_instance, site_instance1);
 
   ShellAddedObserver shell_observer2;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      opener_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      opener_contents,
       "window.domAutomationController.send(openWindow('../title2.html'));",
       &success));
   EXPECT_TRUE(success);
@@ -1351,9 +1319,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
 
   // Now let's ensure that using JS to add/remove frames results in proper
   // updates.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      opener_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      opener_contents,
       "window.domAutomationController.send(removeFrame());",
       &success));
   EXPECT_TRUE(success);
@@ -1367,9 +1334,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
       NOTIFICATION_LOAD_STOP,
       Source<NavigationController>(
               &opener_contents->GetController()));
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      opener_contents->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      opener_contents,
       "window.domAutomationController.send(addFrame());",
       &success));
   EXPECT_TRUE(success);
@@ -1419,9 +1385,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Open a same-site page in a new window.
   ShellAddedObserver new_shell_observer;
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(openWindow());",
       &success));
   EXPECT_TRUE(success);
diff --git a/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc
index 8c0bb30..77763ab 100644
--- a/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc
@@ -40,9 +40,8 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest,
 
   // Focus to the text field, the IME should be enabled.
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(text01_focus());",
       &success));
   EXPECT_TRUE(success);
@@ -52,9 +51,8 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest,
 
   // Focus to the password field, the IME should be disabled.
   success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(password02_focus());",
       &success));
   EXPECT_TRUE(success);
@@ -80,9 +78,8 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest,
 
   // Focus to the text field, the IME should be enabled.
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(text01_focus());",
       &success));
   EXPECT_TRUE(success);
@@ -92,9 +89,8 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest,
 
   // Focus to another text field, the IME should be enabled.
   success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(text02_focus());",
       &success));
   EXPECT_TRUE(success);
@@ -120,9 +116,8 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest,
 
   // Focus to the password field, the IME should be disabled.
   bool success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(password01_focus());",
       &success));
   EXPECT_TRUE(success);
@@ -132,9 +127,8 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest,
 
   // Focus to the another password field, the IME should be disabled.
   success = false;
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
       "window.domAutomationController.send(password02_focus());",
       &success));
   EXPECT_TRUE(success);
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc
index c81f89c..c57f1a6 100644
--- a/content/browser/session_history_browsertest.cc
+++ b/content/browser/session_history_browsertest.cc
@@ -429,18 +429,16 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, LocationChangeInSubframe) {
 // http://code.google.com/p/chromium/issues/detail?id=56267
 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   int length;
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractInt(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScriptAndExtractInt(
+      shell()->web_contents(),
       "domAutomationController.send(history.length)",
       &length));
   EXPECT_EQ(1, length);
 
   NavigateToURL(shell(), GetURL("title1.html"));
 
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractInt(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScriptAndExtractInt(
+      shell()->web_contents(),
       "domAutomationController.send(history.length)",
       &length));
   EXPECT_EQ(2, length);
@@ -448,9 +446,8 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   // Now test that history.length is updated when the navigation is committed.
   NavigateToURL(shell(), GetURL("record_length.html"));
 
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractInt(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScriptAndExtractInt(
+      shell()->web_contents(),
       "domAutomationController.send(history.length)",
       &length));
   EXPECT_EQ(3, length);
@@ -461,9 +458,8 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   // Ensure history.length is properly truncated.
   NavigateToURL(shell(), GetURL("title2.html"));
 
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractInt(
-      shell()->web_contents()->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScriptAndExtractInt(
+      shell()->web_contents(),
       "domAutomationController.send(history.length)",
       &length));
   EXPECT_EQ(2, length);
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index b215efe..d71bbe0 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -152,8 +152,7 @@ class SitePerProcessBrowserTest : public ContentBrowserTest {
         NOTIFICATION_LOAD_STOP,
         Source<NavigationController>(
             &shell()->web_contents()->GetController()));
-    bool result = ExecuteJavaScript(window->web_contents()->GetRenderViewHost(),
-                                    "", script);
+    bool result = ExecuteScript(window->web_contents(), script);
     load_observer.Wait();
     return result;
   }
diff --git a/content/browser/webrtc_browsertest.cc b/content/browser/webrtc_browsertest.cc
index 3e5b224..2343e0a 100644
--- a/content/browser/webrtc_browsertest.cc
+++ b/content/browser/webrtc_browsertest.cc
@@ -30,10 +30,7 @@ class WebrtcBrowserTest: public ContentBrowserTest {
   }
  protected:
   bool ExecuteJavascript(const std::string& javascript) {
-    RenderViewHost* render_view_host =
-        shell()->web_contents()->GetRenderViewHost();
-
-    return ExecuteJavaScript(render_view_host, "", javascript);
+    return ExecuteScript(shell()->web_contents(), javascript);
   }
 
   void ExpectTitle(const std::string& expected_title) const {
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index f793a37..69d0b98cd 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -39,11 +39,11 @@ namespace {
 class DOMOperationObserver : public NotificationObserver,
                              public WebContentsObserver {
  public:
-  explicit DOMOperationObserver(RenderViewHost* render_view_host)
-      : WebContentsObserver(WebContents::FromRenderViewHost(render_view_host)),
+  explicit DOMOperationObserver(RenderViewHost* rvh)
+      : WebContentsObserver(WebContents::FromRenderViewHost(rvh)),
         did_respond_(false) {
     registrar_.Add(this, NOTIFICATION_DOM_OPERATION_RESPONSE,
-                   Source<RenderViewHost>(render_view_host));
+                   Source<RenderViewHost>(rvh));
     message_loop_runner_ = new MessageLoopRunner;
   }
 
@@ -78,18 +78,18 @@ class DOMOperationObserver : public NotificationObserver,
 };
 
 // Specifying a prototype so that we can add the WARN_UNUSED_RESULT attribute.
-bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host,
-                             const std::string& frame_xpath,
-                             const std::string& original_script,
-                             scoped_ptr<Value>* result) WARN_UNUSED_RESULT;
+bool ExecuteScriptHelper(RenderViewHost* render_view_host,
+                         const std::string& frame_xpath,
+                         const std::string& original_script,
+                         scoped_ptr<Value>* result) WARN_UNUSED_RESULT;
 
 // Executes the passed |original_script| in the frame pointed to by
 // |frame_xpath|.  If |result| is not NULL, stores the value that the evaluation
 // of the script in |result|.  Returns true on success.
-bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host,
-                             const std::string& frame_xpath,
-                             const std::string& original_script,
-                             scoped_ptr<Value>* result) {
+bool ExecuteScriptHelper(RenderViewHost* render_view_host,
+                         const std::string& frame_xpath,
+                         const std::string& original_script,
+                         scoped_ptr<Value>* result) {
   // TODO(jcampan): we should make the domAutomationController not require an
   //                automation id.
   std::string script =
@@ -280,53 +280,93 @@ void SimulateKeyPress(WebContents* web_contents,
   web_contents->GetRenderViewHost()->ForwardKeyboardEvent(event_up);
 }
 
-bool ExecuteJavaScript(RenderViewHost* render_view_host,
-                       const std::string& frame_xpath,
-                       const std::string& original_script) {
+namespace internal {
+
+ToRenderViewHost::ToRenderViewHost(WebContents* web_contents)
+    : render_view_host_(web_contents->GetRenderViewHost()) {
+}
+
+ToRenderViewHost::ToRenderViewHost(RenderViewHost* render_view_host)
+    : render_view_host_(render_view_host) {
+}
+
+}  // namespace internal
+
+bool ExecuteScriptInFrame(const internal::ToRenderViewHost& adapter,
+                          const std::string& frame_xpath,
+                          const std::string& original_script) {
   std::string script =
       original_script + ";window.domAutomationController.send(0);";
-  return ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, NULL);
+  return ExecuteScriptHelper(adapter.render_view_host(), frame_xpath, script,
+                             NULL);
 }
 
-bool ExecuteJavaScriptAndExtractInt(RenderViewHost* render_view_host,
-                                    const std::string& frame_xpath,
-                                    const std::string& script,
-                                    int* result) {
+bool ExecuteScriptInFrameAndExtractInt(
+    const internal::ToRenderViewHost& adapter,
+    const std::string& frame_xpath,
+    const std::string& script,
+    int* result) {
   DCHECK(result);
   scoped_ptr<Value> value;
-  if (!ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, &value) ||
-      !value.get())
+  if (!ExecuteScriptHelper(adapter.render_view_host(), frame_xpath, script,
+                           &value) || !value.get())
     return false;
 
   return value->GetAsInteger(result);
 }
 
-bool ExecuteJavaScriptAndExtractBool(RenderViewHost* render_view_host,
-                                     const std::string& frame_xpath,
-                                     const std::string& script,
-                                     bool* result) {
+bool ExecuteScriptInFrameAndExtractBool(
+    const internal::ToRenderViewHost& adapter,
+    const std::string& frame_xpath,
+    const std::string& script,
+    bool* result) {
   DCHECK(result);
   scoped_ptr<Value> value;
-  if (!ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, &value) ||
-      !value.get())
+  if (!ExecuteScriptHelper(adapter.render_view_host(), frame_xpath, script,
+                           &value) || !value.get())
     return false;
 
   return value->GetAsBoolean(result);
 }
 
-bool ExecuteJavaScriptAndExtractString(RenderViewHost* render_view_host,
-                                       const std::string& frame_xpath,
-                                       const std::string& script,
-                                       std::string* result) {
+bool ExecuteScriptInFrameAndExtractString(
+    const internal::ToRenderViewHost& adapter,
+    const std::string& frame_xpath,
+    const std::string& script,
+    std::string* result) {
   DCHECK(result);
   scoped_ptr<Value> value;
-  if (!ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, &value) ||
-      !value.get())
+  if (!ExecuteScriptHelper(adapter.render_view_host(), frame_xpath, script,
+                           &value) || !value.get())
     return false;
 
   return value->GetAsString(result);
 }
 
+bool ExecuteScript(const internal::ToRenderViewHost& adapter,
+                   const std::string& script) {
+  return ExecuteScriptInFrame(adapter, std::string(), script);
+}
+
+bool ExecuteScriptAndExtractInt(const internal::ToRenderViewHost& adapter,
+                                const std::string& script, int* result) {
+  return ExecuteScriptInFrameAndExtractInt(adapter, std::string(), script,
+                                           result);
+}
+
+bool ExecuteScriptAndExtractBool(const internal::ToRenderViewHost& adapter,
+                                 const std::string& script, bool* result) {
+  return ExecuteScriptInFrameAndExtractBool(adapter, std::string(), script,
+                                            result);
+}
+
+bool ExecuteScriptAndExtractString(const internal::ToRenderViewHost& adapter,
+                                   const std::string& script,
+                                   std::string* result) {
+  return ExecuteScriptInFrameAndExtractString(adapter, std::string(), script,
+                                              result);
+}
+
 std::string GetCookies(BrowserContext* browser_context, const GURL& url) {
   std::string cookies;
   base::WaitableEvent event(true, false);
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index 8f7d380..5ae5644 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -78,34 +78,67 @@ void SimulateKeyPress(WebContents* web_contents,
                       bool alt,
                       bool command);
 
+// Allow ExecuteScript* methods to target either a WebContents or a
+// RenderViewHost.  Targetting a WebContents means executing script in the
+// RenderViewHost returned by WebContents::GetRenderViewHost(), which is the
+// "current" RenderViewHost.  Pass a specific RenderViewHost to target, for
+// example, a "swapped-out" RenderViewHost.
+namespace internal {
+class ToRenderViewHost {
+ public:
+  ToRenderViewHost(WebContents* web_contents);
+  ToRenderViewHost(RenderViewHost* render_view_host);
+
+  RenderViewHost* render_view_host() const { return render_view_host_; }
+
+ private:
+  RenderViewHost* render_view_host_;
+};
+}  // namespace internal
+
 // Executes the passed |script| in the frame pointed to by |frame_xpath| (use
 // empty string for main frame).  The |script| should not invoke
 // domAutomationController.send(); otherwise, your test will hang or be flaky.
 // If you want to extract a result, use one of the below functions.
 // Returns true on success.
-bool ExecuteJavaScript(RenderViewHost* render_view_host,
-                       const std::string& frame_xpath,
-                       const std::string& script) WARN_UNUSED_RESULT;
+bool ExecuteScriptInFrame(const internal::ToRenderViewHost& adapter,
+                          const std::string& frame_xpath,
+                          const std::string& script) WARN_UNUSED_RESULT;
 
 // The following methods executes the passed |script| in the frame pointed to by
 // |frame_xpath| (use empty string for main frame) and sets |result| to the
-// value returned by the script evaluation.
-// They return true on success, false if the script evaluation failed or did not
+// value passed to "window.domAutomationController.send" by the executed script.
+// They return true on success, false if the script execution failed or did not
 // evaluate to the expected type.
-bool ExecuteJavaScriptAndExtractInt(RenderViewHost* render_view_host,
-                                    const std::string& frame_xpath,
-                                    const std::string& script,
-                                    int* result) WARN_UNUSED_RESULT;
-bool ExecuteJavaScriptAndExtractBool(RenderViewHost* render_view_host,
-                                     const std::string& frame_xpath,
-                                     const std::string& script,
-                                     bool* result) WARN_UNUSED_RESULT;
-bool ExecuteJavaScriptAndExtractString(
-    RenderViewHost* render_view_host,
+bool ExecuteScriptInFrameAndExtractInt(
+    const internal::ToRenderViewHost& adapter,
+    const std::string& frame_xpath,
+    const std::string& script,
+    int* result) WARN_UNUSED_RESULT;
+bool ExecuteScriptInFrameAndExtractBool(
+    const internal::ToRenderViewHost& adapter,
+    const std::string& frame_xpath,
+    const std::string& script,
+    bool* result) WARN_UNUSED_RESULT;
+bool ExecuteScriptInFrameAndExtractString(
+    const internal::ToRenderViewHost& adapter,
     const std::string& frame_xpath,
     const std::string& script,
     std::string* result) WARN_UNUSED_RESULT;
 
+// Top-frame script execution helpers (a.k.a., the common case):
+bool ExecuteScript(const internal::ToRenderViewHost& adapter,
+                   const std::string& script) WARN_UNUSED_RESULT;
+bool ExecuteScriptAndExtractInt(const internal::ToRenderViewHost& adapter,
+                                const std::string& script,
+                                int* result) WARN_UNUSED_RESULT;
+bool ExecuteScriptAndExtractBool(const internal::ToRenderViewHost& adapter,
+                                 const std::string& script,
+                                 bool* result) WARN_UNUSED_RESULT;
+bool ExecuteScriptAndExtractString(const internal::ToRenderViewHost& adapter,
+                                   const std::string& script,
+                                   std::string* result) WARN_UNUSED_RESULT;
+
 // Returns the cookies for the given url.
 std::string GetCookies(BrowserContext* browser_context, const GURL& url);