Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/extension_startup_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 108 matching lines @@
   void TestInjection(bool expect_css, bool expect_script) {
     // Load a page affected by the content script and test to see the effect.
     FilePath test_file;
     PathService::Get(chrome::DIR_TEST_DATA, &test_file);
     test_file = test_file.AppendASCII("extensions")
                          .AppendASCII("test_file.html");
 
     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);
   }
 
   FilePath preferences_file_;
   FilePath extensions_dir_;
   FilePath user_scripts_dir_;
   bool enable_extensions_;
   // Extensions to load from the command line.
@@ skipping 123 matching lines @@
         .AppendASCII("extensions")
         .AppendASCII("app2");
     load_extensions_.push_back(fourth_extension_path.value());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) {
   WaitForServicesToStart(4, true);
   TestInjection(true, true);
 }