glue: use string16 in place of wstring for Unicode text

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2010 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 242 matching lines @@
         const string16& mime_type =
             frame->dataSource()->response().mimeType();
         if (EqualsASCII(mime_type, "text/plain")) {
           should_dump_as_text = true;
           should_generate_pixel_results = false;
         }
       }
       if (should_dump_as_text) {
         bool recursive = shell->layout_test_controller_->
             ShouldDumpChildFramesAsText();
-        std::string data_utf8 = WideToUTF8(
+        std::string data_utf8 = UTF16ToUTF8(
             webkit_glue::DumpFramesAsText(frame, recursive));
         if (fwrite(data_utf8.c_str(), 1, data_utf8.size(), stdout) !=
             data_utf8.size()) {
           LOG(FATAL) << "Short write to stdout, disk full?";
         }
       } else {
-        printf("%s", WideToUTF8(
+        printf("%s", UTF16ToUTF8(
             webkit_glue::DumpRenderer(frame)).c_str());
 
         bool recursive = shell->layout_test_controller_->
             ShouldDumpChildFrameScrollPositions();
         printf("%s", WideToUTF8(
             webkit_glue::DumpFrameScrollPosition(frame, recursive)).c_str());
       }
 
       if (shell->layout_test_controller_->ShouldDumpBackForwardList()) {
         std::wstring bfDump;
@@ skipping 429 matching lines @@
 void TestShell::GoBackOrForward(int offset) {
     navigation_controller_->GoToOffset(offset);
 }
 
 void TestShell::DumpDocumentText() {
   FilePath file_path;
   if (!PromptForSaveFile(L"Dump document text", &file_path))
       return;
 
   const std::string data =
-      WideToUTF8(webkit_glue::DumpDocumentText(webView()->mainFrame()));
+      UTF16ToUTF8(webkit_glue::DumpDocumentText(webView()->mainFrame()));
   file_util::WriteFile(file_path, data.c_str(), data.length());
 }
 
 void TestShell::DumpRenderTree() {
   FilePath file_path;
   if (!PromptForSaveFile(L"Dump render tree", &file_path))
     return;
 
   const std::string data =
-      WideToUTF8(webkit_glue::DumpRenderer(webView()->mainFrame()));
+      UTF16ToUTF8(webkit_glue::DumpRenderer(webView()->mainFrame()));
   file_util::WriteFile(file_path, data.c_str(), data.length());
 }
 
-std::wstring TestShell::GetDocumentText() {
+string16 TestShell::GetDocumentText() {
   return webkit_glue::DumpDocumentText(webView()->mainFrame());
 }
 
 void TestShell::Reload() {
     navigation_controller_->Reload();
 }
 
 void TestShell::SetFocus(WebWidgetHost* host, bool enable) {
   if (!layout_test_mode_) {
     InteractiveSetFocus(host, enable);
@@ skipping 144 matching lines @@
     for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
       if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
         NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path);
         plugins->erase(plugins->begin() + i);
       }
     }
   }
 }
 
 }  // namespace webkit_glue