Simplify ExecuteJavaScript* functions.

chrome/browser/ui/webui/bookmarks_ui_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 "chrome/test/ui/ui_test.h"
 
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 14 matching lines @@
         content::NotificationService::AllSources(), NULL, 2);
 
     // Bring up the bookmarks manager tab.
     chrome::ShowBookmarkManager(browser());
     navigation_observer.Wait();
   }
 
   void AssertIsBookmarksPage(content::WebContents* tab) {
     GURL url;
     std::string out;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        tab->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        tab,
         "domAutomationController.send(location.protocol)",
         &out));
     ASSERT_EQ("chrome-extension:", out);
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        tab->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        tab,
         "domAutomationController.send(location.pathname)",
         &out));
     ASSERT_EQ("/main.html", out);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, ShouldRedirectToExtension) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL));
   AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents());
 }
@@ skipping 38 matching lines @@
   navigation_observer.Wait();
 
   ASSERT_EQ(1, browser()->tab_count());
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL));
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
   AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents());
 }