Remove some wstrings in test_shell.

webkit/tools/test_shell/test_shell.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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 466 matching lines @@
 
 void TestShell::ResetTestController() {
   layout_test_controller_->Reset();
   notification_presenter_->Reset();
   delegate_->Reset();
   if (geolocation_client_mock_.get())
     geolocation_client_mock_->resetMock();
 }
 
 void TestShell::LoadFile(const FilePath& file) {
-  LoadURLForFrame(net::FilePathToFileURL(file), std::wstring());
+  LoadURLForFrame(net::FilePathToFileURL(file), string16());
 }
 
 void TestShell::LoadURL(const GURL& url) {
-  LoadURLForFrame(url, std::wstring());
+  LoadURLForFrame(url, string16());
 }
 
 bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) {
   // Get the right target frame for the entry.
   WebFrame* frame = webView()->mainFrame();
-  if (!entry.GetTargetFrame().empty()) {
-      frame = webView()->findFrameByName(
-          WideToUTF16Hack(entry.GetTargetFrame()));
-  }
+  if (!entry.GetTargetFrame().empty())
+      frame = webView()->findFrameByName(entry.GetTargetFrame());
+
   // TODO(mpcomplete): should we clear the target frame, or should
   // back/forward navigations maintain the target frame?
 
   // A navigation resulting from loading a javascript URL should not be
   // treated as a browser initiated event.  Instead, we want it to look as if
   // the page initiated any load resulting from JS execution.
   if (!entry.GetURL().SchemeIs("javascript")) {
     delegate_->set_pending_extra_data(
         new TestShellExtraData(entry.GetPageID()));
   }
@@ skipping 106 matching lines @@
   return speech_input_controller_mock_.get();
 }
 
 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
   if (!geolocation_client_mock_.get()) {
     geolocation_client_mock_.reset(
         WebKit::WebGeolocationClientMock::create());
   }
   return geolocation_client_mock_.get();
 }