Simplify ExecuteJavaScript* functions.

content/browser/database_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_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.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 "content/test/net/url_request_mock_http_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class DatabaseTest : public ContentBrowserTest {
  public:
   DatabaseTest() {}
 
   void RunScriptAndCheckResult(Shell* shell,
                                const std::string& script,
                                const std::string& result) {
     std::string data;
-    ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-        shell->web_contents()->GetRenderViewHost(),
-        std::string(),
+    ASSERT_TRUE(ExecuteScriptAndExtractString(
+        shell->web_contents(),
         script,
         &data));
     ASSERT_EQ(data, result);
   }
 
   void Navigate(Shell* shell) {
     NavigateToURL(shell, GetTestUrl("", "simple_database.html"));
   }
 
   void CreateTable(Shell* shell) {
@@ skipping 15 matching lines @@
     RunScriptAndCheckResult(
         shell, "deleteRecord(" + base::IntToString(index) + ")", "done");
   }
 
   void CompareRecords(Shell* shell, const std::string& expected) {
     RunScriptAndCheckResult(shell, "getRecords()", expected);
   }
 
   bool HasTable(Shell* shell) {
     std::string data;
-    CHECK(ExecuteJavaScriptAndExtractString(
-        shell->web_contents()->GetRenderViewHost(),
-        std::string(),
+    CHECK(ExecuteScriptAndExtractString(
+        shell->web_contents(),
         "getRecords()",
         &data));
     return data != "getRecords error: [object SQLError]";
   }
 };
 
 // Insert records to the database.
 IN_PROC_BROWSER_TEST_F(DatabaseTest, InsertRecord) {
   Navigate(shell());
   CreateTable(shell());
@@ skipping 182 matching lines @@
   Navigate(otr1);
   CreateTable(otr1);
   InsertRecord(otr1, "text");
 
   Shell* otr2 = CreateOffTheRecordBrowser();
   Navigate(otr2);
   CompareRecords(otr2, "text");
 }
 
 }  // namespace content