Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media…

net/ftp/ftp_directory_listing_parser.cc

 // Copyright (c) 2011 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 "net/ftp/ftp_directory_listing_parser.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 92 matching lines @@
 
   // Use first encoding that can be used to decode the text.
   for (size_t i = 0; i < encodings.size(); i++) {
     base::string16 converted_text;
     if (base::CodepageToUTF16(text,
                               encodings[i].c_str(),
                               base::OnStringConversionError::FAIL,
                               &converted_text)) {
       for (size_t j = 0; j < arraysize(kNewlineSeparators); j++) {
         int rv = ParseListing(converted_text,
-                              ASCIIToUTF16(kNewlineSeparators[j]),
+                              base::ASCIIToUTF16(kNewlineSeparators[j]),
                               encodings[i],
                               current_time,
                               entries,
                               server_type);
         if (rv == OK)
           return rv;
       }
     }
   }
 
@@ skipping 12 matching lines @@
 int ParseFtpDirectoryListing(const std::string& text,
                              const base::Time& current_time,
                              std::vector<FtpDirectoryListingEntry>* entries) {
   FtpServerType server_type = SERVER_UNKNOWN;
   int rv = DecodeAndParse(text, current_time, entries, &server_type);
   UpdateFtpServerTypeHistograms(server_type);
   return rv;
 }
 
 }  // namespace net