Simplify ExecuteJavaScript* functions.

chrome/browser/ui/pdf/pdf_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/file_util.h"
 #include "base/hash.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 231 matching lines @@
   // the moment.
   WebKit::WebMouseWheelEvent wheel_event;
   wheel_event.type = WebKit::WebInputEvent::MouseWheel;
   wheel_event.deltaY = -200;
   wheel_event.wheelTicksY = -2;
   WebContents* web_contents = chrome::GetActiveWebContents(browser());
   web_contents->GetRenderViewHost()->ForwardWheelEvent(wheel_event);
   ASSERT_NO_FATAL_FAILURE(WaitForResponse());
 
   int y_offset = 0;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(plugin.pageYOffset())",
       &y_offset));
   ASSERT_GT(y_offset, 0);
 }
 
 #if defined(OS_CHROMEOS)
 // TODO(sanjeevr): http://crbug.com/79837
 #define MAYBE_FindAndCopy DISABLED_FindAndCopy
 #else
 #define MAYBE_FindAndCopy FindAndCopy
@@ skipping 66 matching lines @@
 
     GURL url = pdf_test_server()->GetURL(base_url + filename);
     ui_test_utils::NavigateToURL(browser(), url);
 
     while (true) {
       int last_count = load_stop_notification_count();
       // We might get extraneous chrome::LOAD_STOP notifications when
       // doing async loading.  This happens when the first loader is cancelled
       // and before creating a byte-range request loader.
       bool complete = false;
-      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          std::string(),
+      ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+          chrome::GetActiveWebContents(browser()),
           "window.domAutomationController.send(plugin.documentLoadComplete())",
           &complete));
       if (complete)
         break;
 
       // Check if the LOAD_STOP notification could have come while we run a
       // nested message loop for the JS call.
       if (last_count != load_stop_notification_count())
         continue;
       content::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
     }
   }
 }
 
 INSTANTIATE_TEST_CASE_P(PDFTestFiles,
                         PDFBrowserTest,
                         testing::Range(0, kLoadingNumberOfParts));
 
 IN_PROC_BROWSER_TEST_F(PDFBrowserTest, Action) {
   ASSERT_NO_FATAL_FAILURE(Load());
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "document.getElementsByName('plugin')[0].fitToHeight();"));
 
   std::string zoom1, zoom2;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send("
       "    document.getElementsByName('plugin')[0].getZoomLevel().toString())",
       &zoom1));
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "document.getElementsByName('plugin')[0].fitToWidth();"));
 
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send("
       "    document.getElementsByName('plugin')[0].getZoomLevel().toString())",
       &zoom2));
   ASSERT_NE(zoom1, zoom2);
 }
 
 // Flaky as per http://crbug.com/74549.
 IN_PROC_BROWSER_TEST_F(PDFBrowserTest, DISABLED_OnLoadAndReload) {
   ASSERT_TRUE(pdf_test_server()->Start());
 
   GURL url = pdf_test_server()->GetURL("files/onload_reload.html");
   ui_test_utils::NavigateToURL(browser(), url);
 
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      std::string(),
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "reloadPDF();"));
   observer.Wait();
 
   ASSERT_EQ("success",
             chrome::GetActiveWebContents(browser())->GetURL().query());
 }
 
 }  // namespace