Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/extension_incognito_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 18 matching lines @@
 
   // Open incognito window and navigate to test page.
   Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
       browser()->profile(),
       test_server()->GetURL("files/extensions/test_file.html"));
 
   WebContents* tab = chrome::GetActiveWebContents(otr_browser);
 
   // 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);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoYesScript) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
 
   // Load a dummy extension. This just tests that we don't regress a
@@ skipping 13 matching lines @@
 
   // Open incognito window and navigate to test page.
   Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
       browser()->profile(),
       test_server()->GetURL("files/extensions/test_file.html"));
 
   WebContents* tab = chrome::GetActiveWebContents(otr_browser);
 
   // 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);
 }
 
 // Tests that an extension which is enabled for incognito mode doesn't
 // accidentially create and incognito profile.
 // Test disabled due to http://crbug.com/89054.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_DontCreateIncognitoProfile) {
   ASSERT_FALSE(browser()->profile()->HasOffTheRecordProfile());
@@ skipping 107 matching lines @@
   // Open incognito window and navigate to test page.
   Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
       browser()->profile(),
       test_server()->GetURL("files/extensions/test_file.html"));
 
   // Simulate the incognito's browser action being clicked.
   BrowserActionTestUtil(incognito_browser).Press(0);
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }