Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace.

components/autofill/core/browser/credit_card.cc

 // Copyright 2013 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 "components/autofill/core/browser/credit_card.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <ostream>
@@ skipping 289 matching lines @@
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
       return Expiration2DigitYearAsString();
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
       return Expiration4DigitYearAsString();
 
     case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR: {
       base::string16 month = ExpirationMonthAsString();
       base::string16 year = Expiration2DigitYearAsString();
       if (!month.empty() && !year.empty())
-        return month + ASCIIToUTF16("/") + year;
+        return month + base::ASCIIToUTF16("/") + year;
       return base::string16();
     }
 
     case CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR: {
       base::string16 month = ExpirationMonthAsString();
       base::string16 year = Expiration4DigitYearAsString();
       if (!month.empty() && !year.empty())
-        return month + ASCIIToUTF16("/") + year;
+        return month + base::ASCIIToUTF16("/") + year;
       return base::string16();
     }
 
     case CREDIT_CARD_TYPE:
       return TypeForDisplay();
 
     case CREDIT_CARD_NUMBER:
       return number_;
 
     case CREDIT_CARD_VERIFICATION_CODE:
@@ skipping 99 matching lines @@
   base::string16 label;
   if (number().empty())
     return name_on_card_;  // No CC number, return name only.
 
   base::string16 obfuscated_cc_number = ObfuscatedNumber();
   if (!expiration_month_ || !expiration_year_)
     return obfuscated_cc_number;  // No expiration date set.
 
   // TODO(georgey): Internationalize date.
   base::string16 formatted_date(ExpirationMonthAsString());
-  formatted_date.append(ASCIIToUTF16("/"));
+  formatted_date.append(base::ASCIIToUTF16("/"));
   formatted_date.append(Expiration4DigitYearAsString());
 
   label = l10n_util::GetStringFUTF16(IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT,
                                      obfuscated_cc_number,
                                      formatted_date);
   return label;
 }
 
 void CreditCard::SetInfoForMonthInputType(const base::string16& value) {
   // Check if |text| is "yyyy-mm" format first, and check normal month format.
-  if (!autofill::MatchesPattern(value, UTF8ToUTF16("^[0-9]{4}-[0-9]{1,2}$")))
+  if (!autofill::MatchesPattern(value,
+                                base::UTF8ToUTF16("^[0-9]{4}-[0-9]{1,2}$"))) {
     return;
+  }
 
   std::vector<base::string16> year_month;
   base::SplitString(value, L'-', &year_month);
   DCHECK_EQ((int)year_month.size(), 2);
   int num = 0;
   bool converted = false;
   converted = base::StringToInt(year_month[0], &num);
   DCHECK(converted);
   SetExpirationYear(num);
   converted = base::StringToInt(year_month[1], &num);
@@ skipping 31 matching lines @@
 base::string16 CreditCard::TypeAndLastFourDigits() const {
   base::string16 type = TypeForDisplay();
   // TODO(estade): type may be empty, we probably want to return
   // "Card - 1234" or something in that case.
 
   base::string16 digits = LastFourDigits();
   if (digits.empty())
     return type;
 
   // TODO(estade): i18n.
-  return type + ASCIIToUTF16(" - ") + digits;
+  return type + base::ASCIIToUTF16(" - ") + digits;
 }
 
 void CreditCard::operator=(const CreditCard& credit_card) {
   if (this == &credit_card)
     return;
 
   number_ = credit_card.number_;
   name_on_card_ = credit_card.name_on_card_;
   type_ = credit_card.type_;
   expiration_month_ = credit_card.expiration_month_;
@@ skipping 92 matching lines @@
 }
 
 base::string16 CreditCard::ExpirationMonthAsString() const {
   if (expiration_month_ == 0)
     return base::string16();
 
   base::string16 month = base::IntToString16(expiration_month_);
   if (expiration_month_ >= 10)
     return month;
 
-  base::string16 zero = ASCIIToUTF16("0");
+  base::string16 zero = base::ASCIIToUTF16("0");
   zero.append(month);
   return zero;
 }
 
 base::string16 CreditCard::Expiration4DigitYearAsString() const {
   if (expiration_year_ == 0)
     return base::string16();
 
   return base::IntToString16(Expiration4DigitYear());
 }
@@ skipping 39 matching lines @@
       (expiration_year < 2006 || expiration_year > 10000)) {
     return;
   }
 
   expiration_year_ = expiration_year;
 }
 
 // So we can compare CreditCards with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const CreditCard& credit_card) {
   return os
-      << UTF16ToUTF8(credit_card.Label())
+      << base::UTF16ToUTF8(credit_card.Label())
       << " "
       << credit_card.guid()
       << " "
       << credit_card.origin()
       << " "
-      << UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NAME))
+      << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NAME))
       << " "
-      << UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_TYPE))
+      << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_TYPE))
       << " "
-      << UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NUMBER))
+      << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NUMBER))
       << " "
-      << UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
+      << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
       << " "
-      << UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR));
+      << base::UTF16ToUTF8(
+             credit_card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 }
 
 // These values must match the values in WebKitPlatformSupportImpl in
 // webkit/glue. We send these strings to WebKit, which then asks
 // WebKitPlatformSupportImpl to load the image data.
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kUnionPay = "unionPayCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill