Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_shell_mac.mm

 // 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 <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-runtime.h>
 #include <sys/stat.h>
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/basictypes.h"
 #include "base/debug/debugger.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.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/webkit_resources.h"
 #include "net/base/mime_util.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/resource/data_pack.h"
 #include "ui/gfx/size.h"
@@ skipping 467 matching lines @@
   NSRect r = [m_mainWnd contentRectForFrameRect:[m_mainWnd frame]];
   r.size.width = width;
   r.size.height = height + URLBAR_HEIGHT;
   [m_mainWnd setFrame:[m_mainWnd frameRectForContentRect:r] display:YES];
 }
 
 void TestShell::ResizeSubViews() {
   // handled by Cocoa for us
 }
 
-/* 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++) {
     NSWindow* window = *iter;
     WindowMap::iterator it = window_map_.Get().find(window);
     if (it != window_map_.Get().end())
       it->second->DumpBackForwardList(result);
     else
       LOG(ERROR) << "Failed to find shell for window during dump";
   }
 }
 
 void TestShell::LoadURLForFrame(const GURL& url,
-                                const string16& frame_name) {
+                                const base::string16& frame_name) {
   if (!url.is_valid())
     return;
 
   if (IsSVGTestURL(url)) {
     SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight);
   } else {
     // only resize back to the default when running tests
     if (layout_test_mode())
       SizeToDefault();
   }
@@ skipping 53 matching lines @@
 }
 
 base::StringPiece TestShell::ResourceProvider(int key) {
   base::StringPiece res;
   g_resource_data_pack->GetStringPiece(key, &res);
   return res;
 }
 
 //-----------------------------------------------------------------------------
 
-string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
+base::string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
   base::StringPiece res;
   if (!g_resource_data_pack->GetStringPiece(message_id, &res)) {
     LOG(FATAL) << "failed to load webkit string with id " << message_id;
   }
 
   // Data packs hold strings as either UTF8 or UTF16.
-  string16 msg;
+  base::string16 msg;
   switch (g_resource_data_pack->GetTextEncodingType()) {
   case ui::DataPack::UTF8:
     msg = UTF8ToUTF16(res);
     break;
   case ui::DataPack::UTF16:
-    msg = string16(reinterpret_cast<const char16*>(res.data()),
+    msg = base::string16(reinterpret_cast<const char16*>(res.data()),
                    res.length() / 2);
     break;
   case ui::DataPack::BINARY:
     NOTREACHED();
     break;
   }
 
   return msg;
 }
 
@@ skipping 54 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue