Replace string16 with base::string16 in src/webkit

webkit/support/platform_support_android.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/support/platform_support.h"
 
 #include "base/android/jni_android.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "base/string_piece.h"
 #include "base/test/test_support_android.h"
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_resources.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "net/android/network_library.h"
 #include "ui/android/ui_jni_registrar.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/support/test_webkit_platform_support.h"
@@ skipping 61 matching lines @@
 
 void BeforeShutdown() {
   ResourceBundle::CleanupSharedInstance();
 }
 
 void AfterShutdown() {
 }
 
 }  // namespace webkit_support
 
-string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
+base::string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
   return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
 }
 
 base::StringPiece TestWebKitPlatformSupport::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) {
   base::FilePath resources_path(kDumpRenderTreeDir);
   resources_path = resources_path.Append("DumpRenderTree_resources");
   switch (resource_id) {
     case IDR_BROKENIMAGE: {
@@ skipping 14 matching lines @@
         if (!success)
           LOG(FATAL) << "Failed reading: " << path.value();
       }
       return resize_corner_data;
     }
   }
 
   return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }