Remove more wstrings in webkit/tools/test_shell.

webkit/tools/test_shell/test_webview_delegate.h

 // 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.
 
 // TestWebViewDelegate class:
 // This class implements the WebViewDelegate methods for the test shell.  One
 // instance is owned by each TestShell.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/string16.h"
 #include "build/build_config.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 #include "webkit/tools/test_shell/mock_spellcheck.h"
@@ skipping 307 matching lines @@
   // Extracts the URL and forwards on to SetAddressBarURL().
   void UpdateAddressBar(WebKit::WebView* webView);
 
   // Called when the URL of the page changes.
   // Should be used to update the text of the URL bar.
   void SetAddressBarURL(const GURL& url);
 
   // Show a JavaScript alert as a popup message.
   // The caller should test whether we're in layout test mode and only
   // call this function when we really want a message to pop up.
-  void ShowJavaScriptAlert(const std::wstring& message);
+  void ShowJavaScriptAlert(const string16& message);
 
   // In the Mac code, this is called to trigger the end of a test after the
   // page has finished loading.  From here, we can generate the dump for the
   // test.
   void LocationChangeDone(WebKit::WebFrame*);
 
   // Tests that require moving or resizing the main window (via resizeTo() or
   // moveTo()) pass in Chrome even though Chrome disregards move requests for
   // non-popup windows (see TabContents::RequestMove()).  These functions allow
   // the test shell to mimic its behavior.  If setWindowRect() is called for
   // the main window, the passed in WebRect is saved as fake_rect_ and we return
   // it instead of the real window dimensions whenever rootWindowRect() is
   // called.
   WebKit::WebRect fake_window_rect();
   void set_fake_window_rect(const WebKit::WebRect&);
 
   WebWidgetHost* GetWidgetHost();
 
   void UpdateForCommittedLoad(WebKit::WebFrame* frame, bool is_new_navigation);
   void UpdateURL(WebKit::WebFrame* frame);
   void UpdateSessionHistory(WebKit::WebFrame* frame);
   void UpdateSelectionClipboard(bool is_empty_selection);
 
   // Get a string suitable for dumping a frame to the console.
-  std::wstring GetFrameDescription(WebKit::WebFrame* webframe);
+  string16 GetFrameDescription(WebKit::WebFrame* webframe);
 
   // Causes navigation actions just printout the intended navigation instead
   // of taking you to the page. This is used for cases like mailto, where you
   // don't actually want to open the mail program.
   bool policy_delegate_enabled_;
 
   // Toggles the behavior of the policy delegate.  If true, then navigations
   // will be allowed.  Otherwise, they will be ignored (dropped).
   bool policy_delegate_is_permissive_;
 
@@ skipping 61 matching lines @@
   std::string edit_command_name_;
   std::string edit_command_value_;
 
   // The mock spellchecker used in TestWebViewDelegate::spellCheck().
   MockSpellCheck mock_spellcheck_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_