Simplify ExecuteJavaScript* functions.

chrome/browser/ui/find_bar/find_bar_host_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/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/common/cancelable_request.h"
@@ skipping 451 matching lines @@
   EXPECT_EQ(1,
             FindInPageWchar(web_contents, search_string.c_str(),
                             false, false, NULL));
 }
 
 // Specifying a prototype so that we can add the WARN_UNUSED_RESULT attribute.
 bool FocusedOnPage(WebContents* web_contents, std::string* result)
     WARN_UNUSED_RESULT;
 
 bool FocusedOnPage(WebContents* web_contents, std::string* result) {
-  return content::ExecuteJavaScriptAndExtractString(
-      web_contents->GetRenderViewHost(),
-      "",
+  return content::ExecuteScriptAndExtractString(
+      web_contents,
       "window.domAutomationController.send(getFocusedElement());",
       result);
 }
 
 // This tests the FindInPage end-state, in other words: what is focused when you
 // close the Find box (ie. if you find within a link the link should be
 // focused).
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) {
   // First we navigate to our special focus tracking page.
   GURL url = GetURL(kEndState);
@@ skipping 22 matching lines @@
   // Verify that the link is focused.
   ASSERT_TRUE(FocusedOnPage(web_contents, &result));
   EXPECT_STREQ("link1", result.c_str());
 
   // Search for a text that exists within a link on the page.
   EXPECT_EQ(1, FindInPageWchar(web_contents, L"Google",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 
   // Move the selection to link 1, after searching.
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      web_contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      web_contents,
       "window.domAutomationController.send(selectLink1());",
       &result));
 
   // End the find session.
   find_tab_helper->StopFinding(FindBarController::kKeepSelectionOnPage);
 
   // Verify that link2 is not focused.
   ASSERT_TRUE(FocusedOnPage(web_contents, &result));
   EXPECT_STREQ("", result.c_str());
 }
@@ skipping 51 matching lines @@
       FindTabHelper::FromWebContents(web_contents);
 
   int ordinal = 0;
   EXPECT_EQ(4, FindInPageWchar(web_contents,
                                L"google",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 
   // Move the selection to link 1, after searching.
   std::string result;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      web_contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      web_contents,
       "window.domAutomationController.send(selectLink1());",
       &result));
 
   // Do a find-next after the selection.  This should move forward
   // from there to the 3rd instance of 'google'.
   EXPECT_EQ(4, FindInPageWchar(web_contents,
                                L"google",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(3, ordinal);
 
   // End the find session.
   find_tab_helper->StopFinding(FindBarController::kKeepSelectionOnPage);
 }
 
 // This tests that we start searching after selected text.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        StartSearchAfterSelection) {
   // First we navigate to our test content.
   ui_test_utils::NavigateToURL(browser(), GetURL(kStartAfterSelection));
 
   WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents != NULL);
   int ordinal = 0;
 
   // Move the selection to the text span.
   std::string result;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      web_contents->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      web_contents,
       "window.domAutomationController.send(selectSpan());",
       &result));
 
   // Do a find-next after the selection. This should select the 2nd occurrence
   // of the word 'find'.
   EXPECT_EQ(4, FindInPageWchar(web_contents,
                                L"fi",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(2, ordinal);
 
@@ skipping 864 matching lines @@
   content::RunAllPendingInMessageLoop();  // Needed on Linux.
   EXPECT_TRUE(GetFindBarWindowInfo(&position, NULL));
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   chrome::CloseTab(browser());
   EXPECT_TRUE(GetFindBarWindowInfo(&position2, NULL));
   EXPECT_EQ(position, position2);
 }