Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/simple_clipboard_impl.cc

Index: webkit/tools/test_shell/simple_clipboard_impl.cc
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc
index 995624d0253cd2f2de8c006840813fd0b6a03ad5..067e2e4a57fdc0af03f05eaf9e669631e1110eb2 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.cc
+++ b/webkit/tools/test_shell/simple_clipboard_impl.cc
@@ -8,7 +8,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/zlib/zlib.h"
@@ -46,15 +46,15 @@ void SimpleClipboardClient::Clear(ui::Clipboard::Buffer buffer) {
   GetClipboard()->Clear(buffer);
 }
 
-void SimpleClipboardClient::ReadAvailableTypes(ui::Clipboard::Buffer buffer,
-                                               std::vector<string16>* types,
-                                               bool* contains_filenames) {
-  return GetClipboard()->ReadAvailableTypes(buffer, types,
-                                                     contains_filenames);
+void SimpleClipboardClient::ReadAvailableTypes(
+    ui::Clipboard::Buffer buffer,
+    std::vector<base::string16>* types,
+    bool* contains_filenames) {
+  return GetClipboard()->ReadAvailableTypes(buffer, types, contains_filenames);
 }
 
 void SimpleClipboardClient::ReadText(ui::Clipboard::Buffer buffer,
-                                     string16* result) {
+                                     base::string16* result) {
   GetClipboard()->ReadText(buffer, result);
 }
 
@@ -64,7 +64,7 @@ void SimpleClipboardClient::ReadAsciiText(ui::Clipboard::Buffer buffer,
 }
 
 void SimpleClipboardClient::ReadHTML(ui::Clipboard::Buffer buffer,
-                                     string16* markup,
+                                     base::string16* markup,
                                      GURL* url, uint32* fragment_start,
                                      uint32* fragment_end) {
   std::string url_str;
@@ -102,8 +102,8 @@ void SimpleClipboardClient::ReadImage(ui::Clipboard::Buffer buffer,
 }
 
 void SimpleClipboardClient::ReadCustomData(ui::Clipboard::Buffer buffer,
-                                           const string16& type,
-                                           string16* data) {
+                                           const base::string16& type,
+                                           base::string16* data) {
   GetClipboard()->ReadCustomData(buffer, type, data);
 }