Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,…

webkit/child/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/child/ftp_directory_listing_response_delegate.h"
 
 #include <vector>
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 15 matching lines @@
 using blink::WebURLLoader;
 using blink::WebURLLoaderClient;
 using blink::WebURLResponse;
 
 namespace {
 
 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);
+    return base::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()) {
     base::string16 path_utf16;
     if (base::CodepageToUTF16(path, encoding.c_str(),
                               base::OnStringConversionError::SUBSTITUTE,
                               &path_utf16)) {
       return path_utf16;
@@ skipping 57 matching lines @@
                                            net::UnescapeRule::URL_SPECIAL_CHARS;
   std::string unescaped_path = net::UnescapeURLComponent(response_url.path(),
                                                          unescape_rules);
   SendDataToClient(net::GetDirectoryListingHeader(
       ConvertPathToUTF16(unescaped_path)));
 
   // If this isn't top level directory (i.e. the path isn't "/",)
   // add a link to the parent directory.
   if (response_url.path().length() > 1) {
     SendDataToClient(net::GetDirectoryListingEntry(
-        ASCIIToUTF16(".."), std::string(), false, 0, base::Time()));
+        base::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