diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-02 22:44:13 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-02 22:44:13 +0000 |
| commit | 06bc5d9a46ad798452b317fc47be8acd5ff041c5 (patch) | |
| tree | fe194e49cf0ea3f31a88b60821abb82c4fe6a853 /content/browser/database_browsertest.cc | |
| parent | 78e2370448246f03b6f795b105746bf82ba5f4f4 (diff) | |
| download | chromium_src-06bc5d9a46ad798452b317fc47be8acd5ff041c5.zip chromium_src-06bc5d9a46ad798452b317fc47be8acd5ff041c5.tar.gz chromium_src-06bc5d9a46ad798452b317fc47be8acd5ff041c5.tar.bz2 | |
Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}
to take std::string (UTF-8) instead of std::wstring. This seems to help
simplify callsites considerably.
TBR=jam@chromium.org
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11728003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/database_browsertest.cc')
| -rw-r--r-- | content/browser/database_browsertest.cc | 19 |
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]"; } }; |