diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-03 20:38:18 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-03 20:38:18 +0000 |
| commit | 94f957fcf2bd0d102c35ab6c897332c72b74fc4e (patch) | |
| tree | 23291b650b873a02466f58d3b7e3c04eb62059a7 /webkit/glue/cpp_bound_class_unittest.cc | |
| parent | 5e04fb58560009c5555ff7fb9040521863403c74 (diff) | |
| download | chromium_src-94f957fcf2bd0d102c35ab6c897332c72b74fc4e.zip chromium_src-94f957fcf2bd0d102c35ab6c897332c72b74fc4e.tar.gz chromium_src-94f957fcf2bd0d102c35ab6c897332c72b74fc4e.tar.bz2 | |
glue: use string16 in place of wstring for Unicode text
BUG=23581
TEST=compiles
Review URL: http://codereview.chromium.org/5591004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/cpp_bound_class_unittest.cc')
| -rw-r--r-- | webkit/glue/cpp_bound_class_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/glue/cpp_bound_class_unittest.cc b/webkit/glue/cpp_bound_class_unittest.cc index 2f53c47..54581ad 100644 --- a/webkit/glue/cpp_bound_class_unittest.cc +++ b/webkit/glue/cpp_bound_class_unittest.cc @@ -9,6 +9,7 @@ #include <vector> #include "base/message_loop.h" +#include "base/string_util.h" #include "third_party/WebKit/WebKit/chromium/public/WebData.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" @@ -113,14 +114,15 @@ class CppBoundClassTest : public TestShellTest { // document text is exactly "SUCCESS". void CheckJavaScriptSuccess(const std::string& javascript) { ExecuteJavaScript(javascript); - EXPECT_EQ(L"SUCCESS", webkit_glue::DumpDocumentText(webframe_)); + EXPECT_EQ("SUCCESS", + UTF16ToASCII(webkit_glue::DumpDocumentText(webframe_))); } // Executes the specified JavaScript and checks that the resulting document // text is empty. void CheckJavaScriptFailure(const std::string& javascript) { ExecuteJavaScript(javascript); - EXPECT_EQ(L"", webkit_glue::DumpDocumentText(webframe_)); + EXPECT_EQ("", UTF16ToASCII(webkit_glue::DumpDocumentText(webframe_))); } // Constructs a JavaScript snippet that evaluates and compares the left and |