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

net/cert/x509_cert_types_mac.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 "net/cert/x509_cert_types.h"
 
 #include <CoreServices/CoreServices.h>
 #include <Security/SecAsn1Coder.h>
 #include <Security/Security.h>
 
@@ skipping 98 matching lines @@
       reinterpret_cast<std::string::value_type*>(data.Data),
       data.Length);
 }
 
 // Converts raw CSSM_DATA in ISO-8859-1 to a std::string in UTF-8.
 std::string Latin1DataToUTF8String(CSSM_DATA data) {
   base::string16 utf16;
   if (!CodepageToUTF16(DataToString(data), base::kCodepageLatin1,
                        base::OnStringConversionError::FAIL, &utf16))
     return "";
-  return UTF16ToUTF8(utf16);
+  return base::UTF16ToUTF8(utf16);
 }
 
 // Converts big-endian UTF-16 to UTF-8 in a std::string.
 // Note: The byte-order flipping is done in place on the input buffer!
 bool UTF16BigEndianToUTF8(base::char16* chars, size_t length,
                           std::string* out_string) {
   for (size_t i = 0; i < length; i++)
     chars[i] = EndianU16_BtoN(chars[i]);
-  return UTF16ToUTF8(chars, length, out_string);
+  return base::UTF16ToUTF8(chars, length, out_string);
 }
 
 // Converts big-endian UTF-32 to UTF-8 in a std::string.
 // Note: The byte-order flipping is done in place on the input buffer!
 bool UTF32BigEndianToUTF8(char32* chars, size_t length,
                           std::string* out_string) {
   for (size_t i = 0; i < length; ++i)
     chars[i] = EndianS32_BtoN(chars[i]);
 #if defined(WCHAR_T_IS_UTF32)
-  return WideToUTF8(reinterpret_cast<const wchar_t*>(chars),
+  return base::WideToUTF8(reinterpret_cast<const wchar_t*>(chars),
                     length, out_string);
 #else
 #error This code doesn't handle 16-bit wchar_t.
 #endif
 }
 
 // Adds a type+value pair to the appropriate vector from a C array.
 // The array is keyed by the matching OIDs from kOIDS[].
 void AddTypeValuePair(const CSSM_OID type,
                       const std::string& value,
@@ skipping 133 matching lines @@
       match(locality_name, against.locality_name) &&
       match(state_or_province_name, against.state_or_province_name) &&
       match(country_name, against.country_name) &&
       match(street_addresses, against.street_addresses) &&
       match(organization_names, against.organization_names) &&
       match(organization_unit_names, against.organization_unit_names) &&
       match(domain_components, against.domain_components);
 }
 
 }  // namespace net