Simplify ExecuteJavaScript* functions.

chrome/browser/browsing_data/browsing_data_remover_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/file_path.h"
 #include "base/path_service.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 28 matching lines @@
   virtual void SetUpOnMainThread() OVERRIDE {
     FilePath path;
     PathService::Get(content::DIR_TEST_DATA, &path);
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path));
   }
 
   void RunScriptAndCheckResult(const std::string& script,
                                const std::string& result) {
     std::string data;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        "",
-        script,
-        &data));
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        chrome::GetActiveWebContents(browser()), script, &data));
     ASSERT_EQ(data, result);
   }
 
   void RemoveAndWait(int remove_mask) {
     content::WindowedNotificationObserver signal(
         chrome::NOTIFICATION_BROWSING_DATA_REMOVED,
         content::Source<Profile>(browser()->profile()));
     BrowsingDataRemover* remover = BrowsingDataRemover::CreateForPeriod(
         browser()->profile(), BrowsingDataRemover::LAST_HOUR);
     remover->Remove(remove_mask, BrowsingDataHelper::UNPROTECTED_WEB);
@@ skipping 48 matching lines @@
   ui_test_utils::NavigateToURL(browser(), url);
   RunScriptAndCheckResult("createTable()", "done");
   RunScriptAndCheckResult("insertRecord('text2')", "done");
   RunScriptAndCheckResult("getRecords()", "text2");
 }
 
 // Profile::ClearNetworkingHistorySince should be exercised here too see whether
 // the call gets delegated through ProfileIO[Impl]Data properly, which is hard
 // to write unit-tests for. Currently this is done by both of the above tests.
 // Add standalone test if this changes.