Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_webview_delegate.h

Index: webkit/tools/test_shell/test_webview_delegate.h
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 667cf5f32cd62f861a58e2f00b205982c4353de8..04a898cbb1bf25582e138ae4c97919f1c22de949 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -17,7 +17,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "build/build_config.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h"
@@ -321,7 +321,7 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
  private:
   // Called the title of the page changes.
   // Can be used to update the title of the window.
-  void SetPageTitle(const string16& title);
+  void SetPageTitle(const base::string16& title);
 
   // Called when the URL of the page changes.
   // Extracts the URL and forwards on to SetAddressBarURL().
@@ -334,7 +334,7 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   // 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 string16& message);
+  void ShowJavaScriptAlert(const base::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
@@ -359,7 +359,7 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   void UpdateSelectionClipboard(bool is_empty_selection);
 
   // Get a string suitable for dumping a frame to the console.
-  string16 GetFrameDescription(WebKit::WebFrame* webframe);
+  base::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