glue: use string16 in place of wstring for Unicode text

webkit/glue/cpp_bound_class_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Tests for CppBoundClass, in conjunction with CppBindingExample.  Binds
 // a CppBindingExample class into JavaScript in a custom test shell and tests
 // the binding from the outside by loading JS into the shell.
 
 #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"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/cpp_binding_example.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/tools/test_shell/test_shell_test.h"
 
 using WebKit::WebFrame;
 
@@ skipping 84 matching lines @@
      // The base URL doesn't matter.
      webframe_->loadHTMLString(html, GURL("about:blank"));
 
      test_shell_->WaitTestFinished();
     }
 
    // Executes the specified JavaScript and checks to be sure that the resulting
    // 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
    // right expressions, printing "SUCCESS" to the page if they are equal and
    // printing their actual values if they are not.  Any strings in the
    // expressions should be enclosed in single quotes, and no double quotes
    // should appear in either expression (even if escaped). (If a test case
    // is added that needs fancier quoting, Json::valueToQuotedString could be
    // used here.  For now, it's not worth adding the dependency.)
    std::string BuildJSCondition(std::string left, std::string right) {
@@ skipping 145 matching lines @@
 
 // Ensures existent methods can be invoked successfully when the fallback method
 // is used
 TEST_F(CppBoundClassWithFallbackMethodTest,
        InvokeExistentMethodsWithFallback) {
   std::string js = BuildJSCondition("example.echoValue(34)", "34");
   CheckJavaScriptSuccess(js);
 }
 
 }  // namespace