summaryrefslogtreecommitdiffstats
path: root/content/browser/database_browsertest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/database_browsertest.cc')
-rw-r--r--content/browser/database_browsertest.cc19
1 files changed, 12 insertions, 7 deletions
diff --git a/content/browser/database_browsertest.cc b/content/browser/database_browsertest.cc
index 1b7d165..0c49cfb 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]";
}
};