Simplify ExecuteJavaScript* functions.

chrome/browser/devtools/devtools_sanity_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 80 matching lines @@
 const char kReloadSharedWorkerTestPage[] =
     "files/workers/debug_shared_worker_initialization.html";
 
 void RunTestFunction(DevToolsWindow* window, const char* test_name) {
   std::string result;
 
   // At first check that JavaScript part of the front-end is loaded by
   // 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);
   } else {
     FAIL() << "DevTools front-end is broken.";
   }
 }
 
 class DevToolsSanityTest : public InProcessBrowserTest {
  public:
@@ skipping 400 matching lines @@
   observer.Wait();
 
   RunTestFunction(window_, "testReattachAfterCrash");
   CloseDevToolsWindow();
 }
 
 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));
   ASSERT_EQ("function", result) << "DevTools front-end is broken.";
   CloseDevToolsWindow();
 }
 
 #if defined(OS_MACOSX)
 #define MAYBE_InspectSharedWorker DISABLED_InspectSharedWorker
 #else
@@ skipping 43 matching lines @@
                                         content::CONSOLE_MESSAGE_LEVEL_LOG,
                                         "log");
   devtools_manager->AddMessageToConsole(agent_host,
                                         content::CONSOLE_MESSAGE_LEVEL_ERROR,
                                         "error");
   RunTestFunction(window_, "checkLogAndErrorMessages");
   CloseDevToolsWindow();
 }
 
 }  // namespace