Convert string16 -> base::string16 in components/

components/autofill/browser/wallet/wallet_address.h

Index: components/autofill/browser/wallet/wallet_address.h
diff --git a/components/autofill/browser/wallet/wallet_address.h b/components/autofill/browser/wallet/wallet_address.h
index b8ebf941a3bcbb7f9721ac6122b532208525360c..0b4bf367ec7b4750617f9b20d2bfd02b627bd8fc 100644
--- a/components/autofill/browser/wallet/wallet_address.h
+++ b/components/autofill/browser/wallet/wallet_address.h
@@ -42,13 +42,13 @@ class Address {
   explicit Address(const AutofillProfile& profile);
 
   Address(const std::string& country_name_code,
-          const string16& recipient_name,
-          const string16& address_line_1,
-          const string16& address_line_2,
-          const string16& locality_name,
-          const string16& administrative_area_name,
-          const string16& postal_code_number,
-          const string16& phone_number,
+          const base::string16& recipient_name,
+          const base::string16& address_line_1,
+          const base::string16& address_line_2,
+          const base::string16& locality_name,
+          const base::string16& administrative_area_name,
+          const base::string16& postal_code_number,
+          const base::string16& phone_number,
           const std::string& object_id);
 
   ~Address();
@@ -81,50 +81,53 @@ class Address {
 
   // Returns a string that summarizes this address, suitable for display to
   // the user.
-  string16 DisplayName() const;
+  base::string16 DisplayName() const;
 
   // Returns a string that could be used as a sub-label, suitable for display
   // to the user together with DisplayName().
-  string16 DisplayNameDetail() const;
+  base::string16 DisplayNameDetail() const;
 
   // Returns data appropriate for |type|.
-  string16 GetInfo(AutofillFieldType type,
+  base::string16 GetInfo(AutofillFieldType type,
                    const std::string& app_locale) const;
 
   const std::string& country_name_code() const { return country_name_code_; }
-  const string16& recipient_name() const { return recipient_name_; }
-  const string16& address_line_1() const { return address_line_1_; }
-  const string16& address_line_2() const { return address_line_2_; }
-  const string16& locality_name() const { return locality_name_; }
-  const string16& administrative_area_name() const {
+  const base::string16& recipient_name() const { return recipient_name_; }
+  const base::string16& address_line_1() const { return address_line_1_; }
+  const base::string16& address_line_2() const { return address_line_2_; }
+  const base::string16& locality_name() const { return locality_name_; }
+  const base::string16& administrative_area_name() const {
     return administrative_area_name_;
   }
-  const string16& postal_code_number() const { return postal_code_number_; }
-  const string16& phone_number() const { return phone_number_; }
+  const base::string16& postal_code_number() const {
+    return postal_code_number_;
+  }
+  const base::string16& phone_number() const { return phone_number_; }
   const std::string& object_id() const { return object_id_; }
 
   void set_country_name_code(const std::string& country_name_code) {
     country_name_code_ = country_name_code;
   }
-  void set_recipient_name(const string16& recipient_name) {
+  void set_recipient_name(const base::string16& recipient_name) {
     recipient_name_ = recipient_name;
   }
-  void set_address_line_1(const string16& address_line_1) {
+  void set_address_line_1(const base::string16& address_line_1) {
     address_line_1_ = address_line_1;
   }
-  void set_address_line_2(const string16& address_line_2) {
+  void set_address_line_2(const base::string16& address_line_2) {
     address_line_2_ = address_line_2;
   }
-  void set_locality_name(const string16& locality_name) {
+  void set_locality_name(const base::string16& locality_name) {
     locality_name_ = locality_name;
   }
-  void set_administrative_area_name(const string16& administrative_area_name) {
+  void set_administrative_area_name(
+      const base::string16& administrative_area_name) {
     administrative_area_name_ = administrative_area_name;
   }
-  void set_postal_code_number(const string16& postal_code_number) {
+  void set_postal_code_number(const base::string16& postal_code_number) {
     postal_code_number_ = postal_code_number;
   }
-  void set_phone_number(const string16& phone_number) {
+  void set_phone_number(const base::string16& phone_number) {
     phone_number_ = phone_number;
   }
   void set_object_id(const std::string& object_id) {
@@ -140,12 +143,12 @@ class Address {
   std::string country_name_code_;
 
   // The recipient's name. For example "John Doe".
-  string16 recipient_name_;
+  base::string16 recipient_name_;
 
   // |address_line_1| and |address_line_2| correspond to the "AddressLine"
   // elements in xAL, which are used to hold unstructured text.
-  string16 address_line_1_;
-  string16 address_line_2_;
+  base::string16 address_line_1_;
+  base::string16 address_line_2_;
 
   // Locality.  This is something of a fuzzy term, but it generally refers to
   // the city/town portion of an address.  In regions of the world where
@@ -153,20 +156,20 @@ class Address {
   // (for example, Japan and China), leave locality_name empty and use
   // |address_line_2|.
   // Examples: US city, IT comune, UK post town.
-  string16 locality_name_;
+  base::string16 locality_name_;
 
   // Top-level administrative subdivision of this country.
   // Examples: US state, IT region, UK constituent nation, JP prefecture.
-  string16 administrative_area_name_;
+  base::string16 administrative_area_name_;
 
   // Despite the name, |postal_code_number_| values are frequently alphanumeric.
   // Examples: "94043", "SW1W", "SW1W 9TQ".
-  string16 postal_code_number_;
+  base::string16 postal_code_number_;
 
   // A valid international phone number. If |phone_number_| is a user provided
   // value, it should have been validated using libphonenumber by clients of
   // this class before being set; see http://code.google.com/p/libphonenumber/.
-  string16 phone_number_;
+  base::string16 phone_number_;
 
   // Externalized Online Wallet id for this address.
   std::string object_id_;