Replace string16 with base::string16 in src/webkit

webkit/support/platform_support_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 "webkit/support/platform_support.h"
 
 #import <AppKit/AppKit.h>
 #include <AvailabilityMacros.h>
 #import <Foundation/Foundation.h>
 #import <objc/objc-runtime.h>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/path_service.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "base/utf_string_conversions.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/resource/data_pack.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/support/test_webkit_platform_support.h"
 #import "webkit/support/drt_application_mac.h"
 #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
 
 static ui::DataPack* g_resource_data_pack = NULL;
 
@@ skipping 137 matching lines @@
 }
 
 void AfterShutdown() {
   [DumpRenderTreePasteboard releaseLocalPasteboards];
   [autorelease_pool drain];
   delete g_resource_data_pack;
 }
 
 }  // namespace webkit_support
 
-string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
+base::string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
   // |g_resource_data_pack| is null on unit tests.
   // But som unit tests reach GetLocalizedString().
   if (!g_resource_data_pack)
-    return string16();
+    return base::string16();
   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 43 matching lines @@
       }
     }
     return resize_corner_data;
   }
   }
   base::StringPiece res;
   if (g_resource_data_pack)
     g_resource_data_pack->GetStringPiece(resource_id, &res);
   return res;
 }