Remove more wstrings in webkit/tools/test_shell.

webkit/tools/test_shell/test_webview_delegate_win.cc

Index: webkit/tools/test_shell/test_webview_delegate_win.cc
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index 2f90eda16558a51675dd31a5e63faf1189c85356..f8297ba709d6bcc3b1e20c6cf220bf97eb2d2e8a 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -192,7 +192,7 @@ void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
 
 // Private methods ------------------------------------------------------------
 
-void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
+void TestWebViewDelegate::ShowJavaScriptAlert(const string16& message) {
   MessageBox(NULL, message.c_str(), L"JavaScript Alert", MB_OK);
 }
 
@@ -201,7 +201,7 @@ void TestWebViewDelegate::SetPageTitle(const string16& title) {
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
-  std::wstring url_string = UTF8ToWide(url.spec());
+  string16 url_string = UTF8ToUTF16(url.spec());
   SendMessage(shell_->editWnd(), WM_SETTEXT, 0,
               reinterpret_cast<LPARAM>(url_string.c_str()));
 }