Remove some wstrings in test_shell.

webkit/tools/test_shell/test_shell.cc

Index: webkit/tools/test_shell/test_shell.cc
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index f5142542f0ede7e45e55af447318fa40ac978ef0..311955e37d603492ac41ae2705b605cb91424df0 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -484,20 +484,19 @@ void TestShell::ResetTestController() {
 }
 
 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?