summaryrefslogtreecommitdiffstats
path: root/content/browser/fileapi/file_system_browsertest.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-02 22:44:13 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-02 22:44:13 +0000
commit06bc5d9a46ad798452b317fc47be8acd5ff041c5 (patch)
treefe194e49cf0ea3f31a88b60821abb82c4fe6a853 /content/browser/fileapi/file_system_browsertest.cc
parent78e2370448246f03b6f795b105746bf82ba5f4f4 (diff)
downloadchromium_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/fileapi/file_system_browsertest.cc')
-rw-r--r--content/browser/fileapi/file_system_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc
index be47ac7..e01f08b 100644
--- a/content/browser/fileapi/file_system_browsertest.cc
+++ b/content/browser/fileapi/file_system_browsertest.cc
@@ -42,8 +42,10 @@ class FileSystemBrowserTest : public ContentBrowserTest {
if (result != "pass") {
std::string js_result;
ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
- the_browser->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(getLog())", &js_result));
+ the_browser->web_contents()->GetRenderViewHost(),
+ std::string(),
+ "window.domAutomationController.send(getLog())",
+ &js_result));
FAIL() << "Failed: " << js_result;
}
}