Simplify ExecuteJavaScript* functions.

content/browser/fileapi/file_system_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/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/thread_test_helper.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 23 matching lines @@
     // The test page will perform tests on FileAPI, then navigate to either
     // a #pass or #fail ref.
     Shell* the_browser = incognito ? CreateOffTheRecordBrowser() : shell();
 
     LOG(INFO) << "Navigating to URL and blocking.";
     NavigateToURLBlockUntilNavigationsComplete(the_browser, test_url, 2);
     LOG(INFO) << "Navigation done.";
     std::string result = the_browser->web_contents()->GetURL().ref();
     if (result != "pass") {
       std::string js_result;
-      ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-          the_browser->web_contents()->GetRenderViewHost(),
-          std::string(),
+      ASSERT_TRUE(ExecuteScriptAndExtractString(
+          the_browser->web_contents(),
           "window.domAutomationController.send(getLog())",
           &js_result));
       FAIL() << "Failed: " << js_result;
     }
   }
 };
 
 class FileSystemBrowserTestWithLowQuota : public FileSystemBrowserTest {
  public:
   virtual void SetUpOnMainThread() {
@@ skipping 296 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(FileSystemLayoutTest, WorkersSimpleTemporarySync) {
   RunLayoutTest("workers/simple-temporary-sync.html");
 }
 
 IN_PROC_BROWSER_TEST_F(FileSystemLayoutTest, WorkersSyncOperations) {
   RunLayoutTest("workers/sync-operations.html");
 }
 
 }  // namespace content