Simplify ExecuteJavaScript* functions.

chrome/browser/geolocation/geolocation_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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 51 matching lines @@
     chrome::GetActiveWebContents(browser)->GetRenderViewHost()->
         ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script));
     content::RunMessageLoop();
 
     EXPECT_EQ(base::StringPrintf("\"%d\"", iframe_id), javascript_response_);
     registrar_.RemoveAll();
     // Now that we loaded the iframe, let's fetch its src.
     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);
   }
 
   GURL iframe_url() const { return iframe_url_; }
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
@@ skipping 237 matching lines @@
     EXPECT_EQ(expected_setting,
               settings_state.state_map().find(requesting_origin)->second);
   }
 
   void CheckStringValueFromJavascriptForTab(
       const std::string& expected, const std::string& function,
       WebContents* web_contents) {
     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));
     EXPECT_EQ(expected, result);
   }
 
   void CheckStringValueFromJavascript(
       const std::string& expected, const std::string& function) {
     CheckStringValueFromJavascriptForTab(
         expected, function, chrome::GetActiveWebContents(current_browser_));
@@ skipping 261 matching lines @@
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) {
   html_for_tests_ = "files/geolocation/two_watches.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
   // First, set the JavaScript to navigate when it receives |final_position|.
   double final_position_latitude = 3.17;
   double final_position_longitude = 4.23;
   std::string script = base::StringPrintf(
       "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");
 
   // Send a position which both geolocation watches will receive.
   AddGeolocationWatch(true);
   SetInfobarResponse(current_url_, true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
 
   // The second watch will now have cancelled. Ensure an update still makes
@@ skipping 17 matching lines @@
 
   iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(false);
 
   iframe_xpath_ = "//iframe[@id='iframe_2']";
   AddGeolocationWatch(false);
 
   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);
 }
 
 }  // namespace