Convert string16 -> base::string16 in components/

components/autofill/browser/phone_field.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 "components/autofill/browser/phone_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_field.h"
 #include "components/autofill/browser/autofill_regex_constants.h"
 #include "components/autofill/browser/autofill_scanner.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // This string includes all area code separators, including NoText.
-string16 GetAreaRegex() {
-  string16 area_code = UTF8ToUTF16(autofill::kAreaCodeRe);
+base::string16 GetAreaRegex() {
+  base::string16 area_code = UTF8ToUTF16(autofill::kAreaCodeRe);
   area_code.append(ASCIIToUTF16("|"));  // Regexp separator.
   area_code.append(UTF8ToUTF16(autofill::kAreaCodeNotextRe));
   return area_code;
 }
 
 }  // namespace
 
 PhoneField::~PhoneField() {}
 
 // Phone field grammars - first matched grammar will be parsed. Grammars are
@@ skipping 206 matching lines @@
   }
 
   return ok;
 }
 
 PhoneField::PhoneField() {
   memset(parsed_phone_fields_, 0, sizeof(parsed_phone_fields_));
 }
 
 // static
-string16 PhoneField::GetRegExp(RegexType regex_id) {
+base::string16 PhoneField::GetRegExp(RegexType regex_id) {
   switch (regex_id) {
     case REGEX_COUNTRY:
       return UTF8ToUTF16(autofill::kCountryCodeRe);
     case REGEX_AREA:
       return GetAreaRegex();
     case REGEX_AREA_NOTEXT:
       return UTF8ToUTF16(autofill::kAreaCodeNotextRe);
     case REGEX_PHONE:
       return UTF8ToUTF16(autofill::kPhoneRe);
     case REGEX_PREFIX_SEPARATOR:
       return UTF8ToUTF16(autofill::kPhonePrefixSeparatorRe);
     case REGEX_PREFIX:
       return UTF8ToUTF16(autofill::kPhonePrefixRe);
     case REGEX_SUFFIX_SEPARATOR:
       return UTF8ToUTF16(autofill::kPhoneSuffixSeparatorRe);
     case REGEX_SUFFIX:
       return UTF8ToUTF16(autofill::kPhoneSuffixRe);
     case REGEX_EXTENSION:
       return UTF8ToUTF16(autofill::kPhoneExtensionRe);
     default:
       NOTREACHED();
       break;
   }
-  return string16();
+  return base::string16();
 }