Simplify ExecuteJavaScript* functions.

chrome/browser/popup_blocker_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/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 36 matching lines @@
   GURL GetTestURL() {
     return ui_test_utils::GetTestUrl(
       FilePath(kTestDir),
       FilePath(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html")));
   }
 
   std::vector<WebContents*> GetBlockedContents(Browser* browser) {
     // Do a round trip to the renderer first to flush any in-flight IPCs to
     // create a to-be-blocked window.
     WebContents* tab = chrome::GetActiveWebContents(browser);
-    CHECK(content::ExecuteJavaScript(tab->GetRenderViewHost(), "", ""));
+    CHECK(content::ExecuteScript(tab, ""));
     BlockedContentTabHelper* blocked_content_tab_helper =
         BlockedContentTabHelper::FromWebContents(tab);
     std::vector<WebContents*> blocked_contents;
     blocked_content_tab_helper->GetBlockedContents(&blocked_contents);
     return blocked_contents;
   }
 
   void NavigateAndCheckPopupShown(Browser* browser, const GURL& url) {
     content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_TAB_ADDED,
@@ skipping 98 matching lines @@
       browser()->profile());
   ui_test_utils::WaitForTemplateURLServiceToLoad(service);
   LocationBar* location_bar = browser()->window()->GetLocationBar();
   ui_test_utils::SendToOmniboxAndSubmit(location_bar, search_string);
   OmniboxEditModel* model = location_bar->GetLocationEntry()->model();
   EXPECT_EQ(GURL(search_string), model->CurrentMatch().destination_url);
   EXPECT_EQ(ASCIIToUTF16(search_string), model->CurrentMatch().contents);
 }
 
 }  // namespace