Replace string16 with base::string16 in src/webkit

webkit/glue/ftp_directory_listing_response_delegate.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/ftp_directory_listing_response_delegate.h"
 
 #include <vector>
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 11 matching lines @@
 #include "webkit/glue/weburlresponse_extradata_impl.h"
 
 using net::FtpDirectoryListingEntry;
 
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderClient;
 using WebKit::WebURLResponse;
 
 namespace {
 
-string16 ConvertPathToUTF16(const std::string& path) {
+base::string16 ConvertPathToUTF16(const std::string& path) {
   // Per RFC 2640, FTP servers should use UTF-8 or its proper subset ASCII,
   // but many old FTP servers use legacy encodings. Try UTF-8 first.
   if (IsStringUTF8(path))
     return UTF8ToUTF16(path);
 
   // Try detecting the encoding. The sample is rather small though, so it may
   // fail.
   std::string encoding;
   if (base::DetectEncoding(path, &encoding) && !encoding.empty()) {
-    string16 path_utf16;
+    base::string16 path_utf16;
     if (base::CodepageToUTF16(path, encoding.c_str(),
                               base::OnStringConversionError::SUBSTITUTE,
                               &path_utf16)) {
       return path_utf16;
     }
   }
 
   // Use system native encoding as the last resort.
   return WideToUTF16Hack(base::SysNativeMBToWide(path));
 }
@@ skipping 61 matching lines @@
         ASCIIToUTF16(".."), std::string(), false, 0, base::Time()));
   }
 }
 
 void FtpDirectoryListingResponseDelegate::SendDataToClient(
     const std::string& data) {
   client_->didReceiveData(loader_, data.data(), data.length(), -1);
 }
 
 }  // namespace webkit_glue