Simplify ExecuteJavaScript* functions.

chrome/browser/instant/instant_browsertest.cc

 // Copyright 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/content_settings/host_content_settings_map.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_model_observer.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 119 matching lines @@
     observer.WaitUntilDesiredPreviewState();
   }
 
   std::string WrapScript(const std::string& script) const {
     return "domAutomationController.send(" + script + ")";
   }
 
   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 {
     content::RenderViewHost* rvh = contents->GetRenderViewHost();
     return GetIntFromJS(rvh, "onvisibilitycalls", &onvisibilitycalls_) &&
            GetIntFromJS(rvh, "onchangecalls", &onchangecalls_) &&
            GetIntFromJS(rvh, "onsubmitcalls", &onsubmitcalls_) &&
            GetIntFromJS(rvh, "oncancelcalls", &oncancelcalls_) &&
            GetIntFromJS(rvh, "onresizecalls", &onresizecalls_) &&
            GetStringFromJS(rvh, "value", &value_) &&
            GetBoolFromJS(rvh, "verbatim", &verbatim_) &&
            GetIntFromJS(rvh, "height", &height_);
   }
 
   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,
                          bool expected) WARN_UNUSED_RESULT {
     bool actual = !expected;  // Purposely start with a mis-match.
     // We can only use ASSERT_*() in a method that returns void, hence this
     // convoluted check.
     return GetBoolFromJS(contents->GetRenderViewHost(),
                          "!document.webkitHidden", &actual) &&
            actual == expected;
@@ skipping 899 matching lines @@
   SetOmniboxTextAndWaitForInstantToShow("q");
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 
   // Kill the instant renderer and wait for instant support again.
   KillInstantRenderView();
   FocusOmniboxAndWaitForInstantSupport();
 
   SetOmniboxTextAndWaitForInstantToShow("qu");
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 }