Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}

content/browser/database_browsertest.cc

Index: content/browser/database_browsertest.cc
diff --git a/content/browser/database_browsertest.cc b/content/browser/database_browsertest.cc
index 1b7d165c67346d58c8c50f1896d53c27ed377967..0c49cfb88a537a8751128a628c7b34153368df86 100644
--- a/content/browser/database_browsertest.cc
+++ b/content/browser/database_browsertest.cc
@@ -28,8 +28,10 @@ class DatabaseTest : public ContentBrowserTest {
                                const std::string& result) {
     std::string data;
     ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-        shell->web_contents()->GetRenderViewHost(), L"",
-        ASCIIToWide(script), &data));
+        shell->web_contents()->GetRenderViewHost(),
+        std::string(),
+        script,
+        &data));
     ASSERT_EQ(data, result);
   }
 
@@ -47,13 +49,14 @@ class DatabaseTest : public ContentBrowserTest {
 
   void UpdateRecord(Shell* shell, int index, const std::string& data) {
     RunScriptAndCheckResult(
-      shell, "updateRecord(" + base::IntToString(index) + ", '" + data + "')",
-      "done");
+        shell,
+        "updateRecord(" + base::IntToString(index) + ", '" + data + "')",
+        "done");
   }
 
   void DeleteRecord(Shell* shell, int index) {
     RunScriptAndCheckResult(
-      shell, "deleteRecord(" + base::IntToString(index) + ")", "done");
+        shell, "deleteRecord(" + base::IntToString(index) + ")", "done");
   }
 
   void CompareRecords(Shell* shell, const std::string& expected) {
@@ -63,8 +66,10 @@ class DatabaseTest : public ContentBrowserTest {
   bool HasTable(Shell* shell) {
     std::string data;
     CHECK(ExecuteJavaScriptAndExtractString(
-        shell->web_contents()->GetRenderViewHost(), L"",
-        ASCIIToWide("getRecords()"), &data));
+        shell->web_contents()->GetRenderViewHost(),
+        std::string(),
+        "getRecords()",
+        &data));
     return data != "getRecords error: [object SQLError]";
   }
 };