Replace string16 with base::string16 in src/webkit

webkit/support/platform_support_android.cc

Index: webkit/support/platform_support_android.cc
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
index 0acc1ab60ecd1c6a6b30fb6cc8fcb76950271c03..90b61de42a336234cfbee9e7957fadc04097e833 100644
--- a/webkit/support/platform_support_android.cc
+++ b/webkit/support/platform_support_android.cc
@@ -9,7 +9,7 @@
 #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"
@@ -91,7 +91,7 @@ void AfterShutdown() {
 
 }  // namespace webkit_support
 
-string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
+base::string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
   return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
 }