Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_shell_gtk.cc

 // Copyright (c) 2012 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.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
 #include <signal.h>
 #include <unistd.h>
 
 #include "base/file_util.h"
 #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"
 #include "grit/webkit_resources.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/gtk/gtk_compat.h"
@@ skipping 442 matching lines @@
   GtkWidget* window =
       gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
   gtk_widget_destroy(window);
 }
 
 void TestShell::ResizeSubViews() {
   // This function is used on Windows to re-layout the window on a resize.
   // 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++) {
     GtkWindow* window = *iter;
     TestShell* shell =
         static_cast<TestShell*>(g_object_get_data(G_OBJECT(window),
                                                   "test-shell"));
     shell->DumpBackForwardList(result);
   }
 }
 
 void TestShell::LoadURLForFrame(const GURL& url,
-                                const string16& frame_name) {
+                                const base::string16& frame_name) {
   if (!url.is_valid())
     return;
 
   if (IsSVGTestURL(url)) {
     SizeToSVG();
   } else {
     // only resize back to the default when running tests
     if (layout_test_mode())
       SizeToDefault();
   }
@@ skipping 53 matching lines @@
   gtk_widget_destroy(dialog);
 }
 
 // static
 base::StringPiece TestShell::ResourceProvider(int key) {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(key);
 }
 
 //-----------------------------------------------------------------------------
 
-string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
+base::string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
   return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
 }
 
 base::StringPiece TestShellWebKitInit::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) {
   switch (resource_id) {
     case IDR_BROKENIMAGE:
       resource_id = IDR_BROKENIMAGE_TESTSHELL;
       break;
     case IDR_TEXTAREA_RESIZER:
       resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
       break;
   }
   // TODO(flackr): Pass scale_factor.
   return TestShell::ResourceProvider(resource_id);
 }