webkit: use string16 in webkit_glue.h

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 254 matching lines @@
         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", UTF16ToUTF8(
             webkit_glue::DumpRenderer(frame)).c_str());
 
         bool recursive = shell->layout_test_controller_->
             ShouldDumpChildFrameScrollPositions();
-        printf("%s", WideToUTF8(
+        printf("%s", UTF16ToUTF8(
             webkit_glue::DumpFrameScrollPosition(frame, recursive)).c_str());
       }
 
       if (shell->layout_test_controller_->ShouldDumpBackForwardList()) {
-        std::wstring bfDump;
+        string16 bfDump;
         DumpAllBackForwardLists(&bfDump);
-        printf("%s", WideToUTF8(bfDump).c_str());
+        printf("%s", UTF16ToUTF8(bfDump).c_str());
       }
     }
 
     if (params->dump_pixels && should_generate_pixel_results) {
       // Image output: we write the image data to the file given on the
       // command line (for the dump pixels argument), and the MD5 sum to
       // stdout.
       dumped_anything = true;
       WebViewHost* view_host = shell->webViewHost();
       view_host->webview()->layout();
@@ skipping 263 matching lines @@
   if (layout_test_mode_) {
     accessibility_controller_->BindToJavascript(
         frame, "accessibilityController");
     layout_test_controller_->BindToJavascript(frame, "layoutTestController");
     event_sending_controller_->BindToJavascript(frame, "eventSender");
     plain_text_controller_->BindToJavascript(frame, "plainText");
     text_input_controller_->BindToJavascript(frame, "textInputController");
   }
 }
 
-void TestShell::DumpBackForwardEntry(int index, std::wstring* result) {
+void TestShell::DumpBackForwardEntry(int index, string16* result) {
   int current_index = navigation_controller_->GetLastCommittedEntryIndex();
 
   std::string content_state =
       navigation_controller_->GetEntryAtIndex(index)->GetContentState();
   if (content_state.empty()) {
     content_state = webkit_glue::CreateHistoryStateForURL(
         navigation_controller_->GetEntryAtIndex(index)->GetURL());
   }
 
   result->append(
       webkit_glue::DumpHistoryState(content_state, 8, index == current_index));
 }
 
-void TestShell::DumpBackForwardList(std::wstring* result) {
-  result->append(L"\n============== Back Forward List ==============\n");
+void TestShell::DumpBackForwardList(string16* result) {
+  result->append(ASCIIToUTF16(
+                     "\n============== Back Forward List ==============\n"));
 
   for (int i = 0; i < navigation_controller_->GetEntryCount(); ++i)
     DumpBackForwardEntry(i, result);
 
-  result->append(L"===============================================\n");
+  result->append(ASCIIToUTF16(
+                     "===============================================\n"));
 }
 
 void TestShell::CallJSGC() {
   webView()->mainFrame()->collectGarbage();
 }
 
 WebView* TestShell::CreateWebView() {
   // If we're running layout tests, only open a new window if the test has
   // called layoutTestController.setCanOpenWindows()
   if (layout_test_mode_ && !layout_test_controller_->CanOpenWindows())
@@ skipping 292 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