Remove more wstrings in webkit/tools/test_shell.

webkit/tools/test_shell/test_shell_win.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.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <process.h>
@@ skipping 160 matching lines @@
   void* font_ptr;
   size_t font_size;
   if (base::win::GetDataResourceFromModule(::GetModuleHandle(NULL),
       IDR_AHEM_FONT, &font_ptr, &font_size)) {
     HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts);
     DCHECK(rc != 0);
   }
 
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(test_shell::kCrashDumps)) {
-    std::wstring dir(
+    string16 dir(
         parsed_command_line.GetSwitchValueNative(test_shell::kCrashDumps));
     if (parsed_command_line.HasSwitch(test_shell::kCrashDumpsFulldump)) {
         new google_breakpad::ExceptionHandler(
             dir, 0, &MinidumpCallback, 0, true,
             kFullDumpType, 0, 0);
     } else {
         new google_breakpad::ExceptionHandler(
             dir, 0, &MinidumpCallback, 0, true);
     }
   }
@@ skipping 48 matching lines @@
 
   std::string new_url(url);
   if (url.compare(0, kPrefixLen, kPrefix, kPrefixLen) == 0) {
     FilePath replace_url;
     PathService::Get(base::DIR_EXE, &replace_url);
     replace_url = replace_url.DirName();
     replace_url = replace_url.DirName();
     replace_url = replace_url.AppendASCII("third_party");
     replace_url = replace_url.AppendASCII("WebKit");
     replace_url = replace_url.AppendASCII("LayoutTests");
-    std::wstring replace_url_str = replace_url.value();
+    string16 replace_url_str = replace_url.value();
     replace_url_str.push_back(L'/');
     new_url = std::string("file:///") +
-              WideToUTF8(replace_url_str).append(url.substr(kPrefixLen));
+              UTF16ToUTF8(replace_url_str).append(url.substr(kPrefixLen));
   }
   return new_url;
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 // TestShell implementation
 
 void TestShell::PlatformCleanUp() {
@@ skipping 466 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue