Remove more wstrings in webkit/tools/test_shell.

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2011 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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 436 matching lines @@
   // Returns an empty string as Mac WebKit ('WebKitSupport/WebEditorClient.mm')
   // does. (If this function returns a non-empty string, WebKit replaces the
   // given misspelled string with the result one. This process executes some
   // editor commands and causes layout-test failures.)
   return WebString();
 }
 
 void TestWebViewDelegate::runModalAlertDialog(
     WebFrame* frame, const WebString& message) {
   if (!shell_->layout_test_mode()) {
-    ShowJavaScriptAlert(UTF16ToWideHack(message));
+    ShowJavaScriptAlert(message);
   } else {
     printf("ALERT: %s\n", message.utf8().data());
   }
 }
 
 bool TestWebViewDelegate::runModalConfirmDialog(
     WebFrame* frame, const WebString& message) {
   if (shell_->layout_test_mode()) {
     // When running tests, write to stdout.
     printf("CONFIRM: %s\n", message.utf8().data());
@@ skipping 293 matching lines @@
     WebFrame* frame, WebDataSource* ds) {
   ds->setExtraData(pending_extra_data_.release());
 }
 
 void TestWebViewDelegate::didStartProvisionalLoad(WebFrame* frame) {
   if (!top_loading_frame_) {
     top_loading_frame_ = frame;
   }
 
   if (shell_->layout_test_controller()->StopProvisionalFrameLoads()) {
-    printf("%S - stopping load in didStartProvisionalLoadForFrame callback\n",
-           GetFrameDescription(frame).c_str());
+    printf("%s - stopping load in didStartProvisionalLoadForFrame callback\n",
+           UTF16ToUTF8(GetFrameDescription(frame)).c_str());
     frame->stopLoading();
   }
   UpdateAddressBar(frame->view());
 }
 
 void TestWebViewDelegate::didReceiveServerRedirectForProvisionalLoad(
     WebFrame* frame) {
   UpdateAddressBar(frame->view());
 }
 
@@ skipping 46 matching lines @@
 }
 
 void TestWebViewDelegate::didReceiveTitle(
     WebFrame* frame, const WebString& title, WebTextDirection direction) {
   SetPageTitle(title);
 }
 
 void TestWebViewDelegate::didFinishDocumentLoad(WebFrame* frame) {
   unsigned pending_unload_events = frame->unloadListenerCount();
   if (pending_unload_events) {
-    printf("%S - has %u onunload handler(s)\n",
-        GetFrameDescription(frame).c_str(), pending_unload_events);
+    printf("%s - has %u onunload handler(s)\n",
+        UTF16ToUTF8(GetFrameDescription(frame)).c_str(), pending_unload_events);
   }
 }
 
 void TestWebViewDelegate::didHandleOnloadEvents(WebFrame* frame) {
 }
 
 void TestWebViewDelegate::didFailLoad(
     WebFrame* frame, const WebURLError& error) {
   LocationChangeDone(frame);
 }
@@ skipping 279 matching lines @@
     return;
 
   const WebHistoryItem& history_item =
       shell_->webView()->mainFrame()->previousHistoryItem();
   if (history_item.isNull())
     return;
 
   entry->SetContentState(webkit_glue::HistoryItemToString(history_item));
 }
 
-std::wstring TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
-  std::wstring name = UTF16ToWideHack(webframe->name());
+string16 TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
+  std::string name = UTF16ToUTF8(webframe->name());
 
   if (webframe == shell_->webView()->mainFrame()) {
     if (name.length())
-      return L"main frame \"" + name + L"\"";
+      name = "main frame \"" + name + "\"";
     else
-      return L"main frame";
+      name = "main frame";
   } else {
     if (name.length())
-      return L"frame \"" + name + L"\"";
+      name = "frame \"" + name + "\"";
     else
-      return L"frame (anonymous)";
+      name = "frame (anonymous)";
   }
+  return UTF8ToUTF16(name);
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }