Simplify ExecuteJavaScript* functions.

content/browser/bookmarklet_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/string_util.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class BookmarkletTest : public ContentBrowserTest {
  public:
   void NavigateToStartPage() {
     NavigateToURL(shell(), GURL("data:text/html,start page"));
     EXPECT_EQ("start page", GetBodyText());
   }
 
   std::string GetBodyText() {
     std::string body_text;
-    EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-        shell()->web_contents()->GetRenderViewHost(),
-        "",
+    EXPECT_TRUE(ExecuteScriptAndExtractString(
+        shell()->web_contents(),
         "window.domAutomationController.send(document.body.innerText);",
         &body_text));
     return body_text;
   }
 };
 
 IN_PROC_BROWSER_TEST_F(BookmarkletTest, Redirect) {
   NavigateToStartPage();
 
   NavigateToURL(shell(), GURL(
@@ skipping 28 matching lines @@
   shell()->LoadURL(GURL(
       "javascript:document.open();"
       "document.write('hello world');"
       "document.close();"));
   EXPECT_EQ("hello world", GetBodyText());
 }
 
 
 }  // namespace content