Simplify ExecuteJavaScript* functions.

content/browser/webrtc_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/utf_string_conversions.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
@@ skipping 12 matching lines @@
     // We need fake devices in this test since we want to run on naked VMs. We
     // assume this switch is set by default in content_browsertests.
     ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kUseFakeDeviceForMediaStream));
 
     ASSERT_TRUE(test_server()->Start());
     ContentBrowserTest::SetUp();
   }
  protected:
   bool ExecuteJavascript(const std::string& javascript) {
-    RenderViewHost* render_view_host =
-        shell()->web_contents()->GetRenderViewHost();
-
-    return ExecuteJavaScript(render_view_host, "", javascript);
+    return ExecuteScript(shell()->web_contents(), javascript);
   }
 
   void ExpectTitle(const std::string& expected_title) const {
     string16 expected_title16(ASCIIToUTF16(expected_title));
     TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
 };
 
 // These tests will all make a getUserMedia call with different constraints and
@@ skipping 43 matching lines @@
                        CanSetupAudioAndVideoCallWithoutMsidAndBundle) {
   GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
   EXPECT_TRUE(ExecuteJavascript("callWithoutMsidAndBundle();"));
   ExpectTitle("OK");
 }
 
 }  // namespace content