Convert string16 -> base::string16 in components/

components/autofill/browser/android/auxiliary_profiles_android.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.
 
 // Populates default autofill profile from user's own Android contact.
 #include "components/autofill/browser/android/auxiliary_profiles_android.h"
 
 #include <vector>
 
 #include "base/guid.h"
@@ skipping 15 matching lines @@
 // any existing addresses.
 
 // Randomly generated guid. The Autofillprofile class requires a consistent
 // unique guid or else things break.
 const char kAndroidMeContactA[] = "9A9E1C06-7A3B-48FA-AA4F-135CA6FC25D9";
 
 namespace {
 
 // Takes misc. address information strings from Android API and collapses
 // into single string for "address line 2"
-string16 CollapseAddress(const string16& post_office_box,
-                         const string16& neighborhood) {
-  std::vector<string16> accumulator;
+base::string16 CollapseAddress(const base::string16& post_office_box,
+                         const base::string16& neighborhood) {
+  std::vector<base::string16> accumulator;
   if (!post_office_box.empty())
     accumulator.push_back(post_office_box);
   if (!neighborhood.empty())
     accumulator.push_back(neighborhood);
 
   return JoinString(accumulator, ASCIIToUTF16(", "));
 }
 
 }  // namespace
 
@@ skipping 18 matching lines @@
   // into constituent parts. Instead we just get a long string blob.
   // Disable address population until we implement a way to parse the
   // data.
   // http://crbug.com/178838
   // LoadAddress(profile.get());
 
   return profile.Pass();
 }
 
 void AuxiliaryProfilesAndroid::LoadAddress(AutofillProfile* profile) {
-  string16 street = profile_loader_.GetStreet();
-  string16 post_office_box = profile_loader_.GetPostOfficeBox();
-  string16 neighborhood = profile_loader_.GetNeighborhood();
-  string16 city = profile_loader_.GetCity();
-  string16 postal_code = profile_loader_.GetPostalCode();
-  string16 region = profile_loader_.GetRegion();
-  string16 country = profile_loader_.GetCountry();
+  base::string16 street = profile_loader_.GetStreet();
+  base::string16 post_office_box = profile_loader_.GetPostOfficeBox();
+  base::string16 neighborhood = profile_loader_.GetNeighborhood();
+  base::string16 city = profile_loader_.GetCity();
+  base::string16 postal_code = profile_loader_.GetPostalCode();
+  base::string16 region = profile_loader_.GetRegion();
+  base::string16 country = profile_loader_.GetCountry();
 
-  string16 street2 = CollapseAddress(post_office_box, neighborhood);
+  base::string16 street2 = CollapseAddress(post_office_box, neighborhood);
 
   profile->SetRawInfo(ADDRESS_HOME_LINE1, street);
   profile->SetRawInfo(ADDRESS_HOME_LINE2, street2);
   profile->SetRawInfo(ADDRESS_HOME_CITY, city);
   profile->SetRawInfo(ADDRESS_HOME_STATE, region);
   profile->SetRawInfo(ADDRESS_HOME_ZIP, postal_code);
   profile->SetInfo(ADDRESS_HOME_COUNTRY, country, app_locale_);
 }
 
 void AuxiliaryProfilesAndroid::LoadName(AutofillProfile* profile) {
-  string16 first_name = profile_loader_.GetFirstName();
-  string16 middle_name = profile_loader_.GetMiddleName();
-  string16 last_name = profile_loader_.GetLastName();
+  base::string16 first_name = profile_loader_.GetFirstName();
+  base::string16 middle_name = profile_loader_.GetMiddleName();
+  base::string16 last_name = profile_loader_.GetLastName();
 
   profile->SetRawInfo(NAME_FIRST, first_name);
   profile->SetRawInfo(NAME_MIDDLE, middle_name);
   profile->SetRawInfo(NAME_LAST, last_name);
 }
 
 void AuxiliaryProfilesAndroid::LoadEmailAddress(AutofillProfile* profile) {
-  std::vector<string16> emails;
+  std::vector<base::string16> emails;
   profile_loader_.GetEmailAddresses(&emails);
   profile->SetRawMultiInfo(EMAIL_ADDRESS, emails);
 }
 
 void AuxiliaryProfilesAndroid::LoadPhoneNumbers(AutofillProfile* profile) {
-  std::vector<string16> phone_numbers;
+  std::vector<base::string16> phone_numbers;
   profile_loader_.GetPhoneNumbers(&phone_numbers);
   profile->SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, phone_numbers);
 }
 
 } // namespace autofill