Index: content/browser/database_browsertest.cc |
=================================================================== |
--- content/browser/database_browsertest.cc (revision 174946) |
+++ content/browser/database_browsertest.cc (working copy) |
@@ -28,10 +28,8 @@ |
const std::string& result) { |
std::string data; |
ASSERT_TRUE(ExecuteJavaScriptAndExtractString( |
- shell->web_contents()->GetRenderViewHost(), |
- std::string(), |
- script, |
- &data)); |
+ shell->web_contents()->GetRenderViewHost(), L"", |
+ ASCIIToWide(script), &data)); |
ASSERT_EQ(data, result); |
} |
@@ -49,14 +47,13 @@ |
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) { |
@@ -66,10 +63,8 @@ |
bool HasTable(Shell* shell) { |
std::string data; |
CHECK(ExecuteJavaScriptAndExtractString( |
- shell->web_contents()->GetRenderViewHost(), |
- std::string(), |
- "getRecords()", |
- &data)); |
+ shell->web_contents()->GetRenderViewHost(), L"", |
+ ASCIIToWide("getRecords()"), &data)); |
return data != "getRecords error: [object SQLError]"; |
} |
}; |