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

components/autofill/core/browser/phone_field.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/phone_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_regex_constants.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 namespace {
 
 // This string includes all area code separators, including NoText.
 base::string16 GetAreaRegex() {
-  base::string16 area_code = UTF8ToUTF16(autofill::kAreaCodeRe);
-  area_code.append(ASCIIToUTF16("|"));  // Regexp separator.
-  area_code.append(UTF8ToUTF16(autofill::kAreaCodeNotextRe));
+  base::string16 area_code = base::UTF8ToUTF16(autofill::kAreaCodeRe);
+  area_code.append(base::ASCIIToUTF16("|"));  // Regexp separator.
+  area_code.append(base::UTF8ToUTF16(autofill::kAreaCodeNotextRe));
   return area_code;
 }
 
 }  // namespace
 
 PhoneField::~PhoneField() {}
 
 // Phone field grammars - first matched grammar will be parsed. Grammars are
 // separated by { REGEX_SEPARATOR, FIELD_NONE, 0 }. Suffix and extension are
 // parsed separately unless they are necessary parts of the match.
@@ skipping 140 matching lines @@
   }
 
   scoped_ptr<PhoneField> phone_field(new PhoneField);
   for (int i = 0; i < FIELD_MAX; ++i)
     phone_field->parsed_phone_fields_[i] = parsed_fields[i];
 
   // Look for optional fields.
 
   // Look for a third text box.
   if (!phone_field->parsed_phone_fields_[FIELD_SUFFIX]) {
-    if (!ParseField(scanner, UTF8ToUTF16(autofill::kPhoneSuffixRe),
+    if (!ParseField(scanner, base::UTF8ToUTF16(autofill::kPhoneSuffixRe),
                     &phone_field->parsed_phone_fields_[FIELD_SUFFIX])) {
-      ParseField(scanner, UTF8ToUTF16(autofill::kPhoneSuffixSeparatorRe),
+      ParseField(scanner, base::UTF8ToUTF16(autofill::kPhoneSuffixSeparatorRe),
                  &phone_field->parsed_phone_fields_[FIELD_SUFFIX]);
     }
   }
 
   // Now look for an extension.
-  ParseField(scanner, UTF8ToUTF16(autofill::kPhoneExtensionRe),
+  ParseField(scanner, base::UTF8ToUTF16(autofill::kPhoneExtensionRe),
              &phone_field->parsed_phone_fields_[FIELD_EXTENSION]);
 
   return phone_field.release();
 }
 
 bool PhoneField::ClassifyField(ServerFieldTypeMap* map) const {
   bool ok = true;
 
   DCHECK(parsed_phone_fields_[FIELD_PHONE]);  // Phone was correctly parsed.
 
@@ skipping 38 matching lines @@
 }
 
 PhoneField::PhoneField() {
   memset(parsed_phone_fields_, 0, sizeof(parsed_phone_fields_));
 }
 
 // static
 base::string16 PhoneField::GetRegExp(RegexType regex_id) {
   switch (regex_id) {
     case REGEX_COUNTRY:
-      return UTF8ToUTF16(autofill::kCountryCodeRe);
+      return base::UTF8ToUTF16(autofill::kCountryCodeRe);
     case REGEX_AREA:
       return GetAreaRegex();
     case REGEX_AREA_NOTEXT:
-      return UTF8ToUTF16(autofill::kAreaCodeNotextRe);
+      return base::UTF8ToUTF16(autofill::kAreaCodeNotextRe);
     case REGEX_PHONE:
-      return UTF8ToUTF16(autofill::kPhoneRe);
+      return base::UTF8ToUTF16(autofill::kPhoneRe);
     case REGEX_PREFIX_SEPARATOR:
-      return UTF8ToUTF16(autofill::kPhonePrefixSeparatorRe);
+      return base::UTF8ToUTF16(autofill::kPhonePrefixSeparatorRe);
     case REGEX_PREFIX:
-      return UTF8ToUTF16(autofill::kPhonePrefixRe);
+      return base::UTF8ToUTF16(autofill::kPhonePrefixRe);
     case REGEX_SUFFIX_SEPARATOR:
-      return UTF8ToUTF16(autofill::kPhoneSuffixSeparatorRe);
+      return base::UTF8ToUTF16(autofill::kPhoneSuffixSeparatorRe);
     case REGEX_SUFFIX:
-      return UTF8ToUTF16(autofill::kPhoneSuffixRe);
+      return base::UTF8ToUTF16(autofill::kPhoneSuffixRe);
     case REGEX_EXTENSION:
-      return UTF8ToUTF16(autofill::kPhoneExtensionRe);
+      return base::UTF8ToUTF16(autofill::kPhoneExtensionRe);
     default:
       NOTREACHED();
       break;
   }
   return base::string16();
 }
 
 }  // namespace autofill