Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_shell_gtk.cc

Index: webkit/tools/test_shell/test_shell_gtk.cc
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 527d937033bdf20a4e852211f48a0c0aec6f433a..2b328eed347d3d3f9420eee2d17393728bbb22eb 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -15,7 +15,7 @@
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "grit/test_shell_resources.h"
@@ -478,7 +478,7 @@ void TestShell::ResizeSubViews() {
   // GTK manages layout for us so we do nothing.
 }
 
-/* static */ void TestShell::DumpAllBackForwardLists(string16* result) {
+/* static */ void TestShell::DumpAllBackForwardLists(base::string16* result) {
   result->clear();
   for (WindowList::iterator iter = TestShell::windowList()->begin();
        iter != TestShell::windowList()->end(); iter++) {
@@ -491,7 +491,7 @@ void TestShell::ResizeSubViews() {
 }
 
 void TestShell::LoadURLForFrame(const GURL& url,
-                                const string16& frame_name) {
+                                const base::string16& frame_name) {
   if (!url.is_valid())
     return;
 
@@ -565,7 +565,7 @@ base::StringPiece TestShell::ResourceProvider(int key) {
 
 //-----------------------------------------------------------------------------
 
-string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
+base::string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
   return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
 }