Replace string16 with base::string16 in src/webkit

webkit/glue/webclipboard_impl.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/glue/webclipboard_impl.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 95 matching lines @@
     default:
       NOTREACHED();
   }
 
   return false;
 }
 
 WebVector<WebString> WebClipboardImpl::readAvailableTypes(
     Buffer buffer, bool* contains_filenames) {
   ui::Clipboard::Buffer buffer_type;
-  std::vector<string16> types;
+  std::vector<base::string16> types;
   if (ConvertBufferType(buffer, &buffer_type)) {
     client_->ReadAvailableTypes(buffer_type, &types, contains_filenames);
   }
   return types;
 }
 
 WebString WebClipboardImpl::readPlainText(Buffer buffer) {
   ui::Clipboard::Buffer buffer_type;
   if (!ConvertBufferType(buffer, &buffer_type))
     return WebString();
 
   if (client_->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
                                  buffer_type)) {
-    string16 text;
+    base::string16 text;
     client_->ReadText(buffer_type, &text);
     if (!text.empty())
       return text;
   }
 
   if (client_->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
                                  buffer_type)) {
     std::string text;
     client_->ReadAsciiText(buffer_type, &text);
     if (!text.empty())
       return ASCIIToUTF16(text);
   }
 
   return WebString();
 }
 
 WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url,
                                      unsigned* fragment_start,
                                      unsigned* fragment_end) {
   ui::Clipboard::Buffer buffer_type;
   if (!ConvertBufferType(buffer, &buffer_type))
     return WebString();
 
-  string16 html_stdstr;
+  base::string16 html_stdstr;
   GURL gurl;
   client_->ReadHTML(buffer_type, &html_stdstr, &gurl,
                     static_cast<uint32*>(fragment_start),
                     static_cast<uint32*>(fragment_end));
   *source_url = gurl;
   return html_stdstr;
 }
 
 WebData WebClipboardImpl::readImage(Buffer buffer) {
   ui::Clipboard::Buffer buffer_type;
   if (!ConvertBufferType(buffer, &buffer_type))
     return WebData();
 
   std::string png_data;
   client_->ReadImage(buffer_type, &png_data);
   return WebData(png_data);
 }
 
 WebString WebClipboardImpl::readCustomData(Buffer buffer,
                                            const WebString& type) {
   ui::Clipboard::Buffer buffer_type;
   if (!ConvertBufferType(buffer, &buffer_type))
     return WebString();
 
-  string16 data;
+  base::string16 data;
   client_->ReadCustomData(buffer_type, type, &data);
   return data;
 }
 
 void WebClipboardImpl::writeHTML(
     const WebString& html_text, const WebURL& source_url,
     const WebString& plain_text, bool write_smart_paste) {
   ScopedClipboardWriterGlue scw(client_);
   scw.WriteHTML(html_text, source_url.spec());
   scw.WriteText(plain_text);
@@ skipping 79 matching lines @@
 #endif
 #endif
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }
 
 }  // namespace webkit_glue