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 /chrome/test/base/ui_test_utils.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 'chrome/test/base/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/base/ui_test_utils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 932cafa..3db0e50 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -564,11 +564,11 @@ class SnapshotTaker { bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) WARN_UNUSED_RESULT { - const wchar_t* script = - L"window.domAutomationController.send(" - L" JSON.stringify([document.width, document.height]))"; + const char* script = + "window.domAutomationController.send(" + "JSON.stringify([document.width, document.height]))"; std::string json; - if (!content::ExecuteJavaScriptAndExtractString(rvh, L"", script, &json)) + if (!content::ExecuteJavaScriptAndExtractString(rvh, "", script, &json)) return false; // Parse the JSON. |