1 files changed, 19 insertions, 20 deletions

diff --git a/chromium/components/autofill/core/browser/data_model/contact_info.h b/chromium/components/autofill/core/browser/data_model/contact_info.h
index 818dbed3b7e..9e75f1a6f3d 100644
--- a/chromium/components/autofill/core/browser/data_model/contact_info.h
+++ b/chromium/components/autofill/core/browser/data_model/contact_info.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/strings/string16.h"
 #include "components/autofill/core/browser/data_model/autofill_structured_address_name.h"
 #include "components/autofill/core/browser/data_model/form_group.h"
 
@@ -30,15 +29,15 @@ class NameInfo : public FormGroup {
   bool operator!=(const NameInfo& other) const { return !operator==(other); }
 
   // FormGroup:
-  base::string16 GetRawInfo(ServerFieldType type) const override;
+  std::u16string GetRawInfo(ServerFieldType type) const override;
 
-  void GetMatchingTypes(const base::string16& text,
+  void GetMatchingTypes(const std::u16string& text,
                         const std::string& app_locale,
                         ServerFieldTypeSet* matching_types) const override;
 
   void SetRawInfoWithVerificationStatus(
       ServerFieldType type,
-      const base::string16& value,
+      const std::u16string& value,
       structured_address::VerificationStatus status) override;
 
   // Derives all missing tokens in the structured representation of the name by
@@ -77,12 +76,12 @@ class NameInfo : public FormGroup {
  private:
   // FormGroup:
   void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
-  base::string16 GetInfoImpl(const AutofillType& type,
+  std::u16string GetInfoImpl(const AutofillType& type,
                              const std::string& app_locale) const override;
 
   bool SetInfoWithVerificationStatusImpl(
       const AutofillType& type,
-      const base::string16& value,
+      const std::u16string& value,
       const std::string& app_locale,
       structured_address::VerificationStatus status) override;
 
@@ -92,21 +91,21 @@ class NameInfo : public FormGroup {
 
   // Returns the full name, which is either |full_|, or if |full_| is empty,
   // is composed of given, middle and family.
-  base::string16 FullName() const;
+  std::u16string FullName() const;
 
   // Returns the middle initial if |middle_| is non-empty.  Returns an empty
   // string otherwise.
-  base::string16 MiddleInitial() const;
+  std::u16string MiddleInitial() const;
 
   // Sets |given_|, |middle_|, and |family_| to the tokenized |full|.
-  void SetFullName(const base::string16& full);
+  void SetFullName(const std::u16string& full);
 
   // Legacy fields to store the unstructured representation of the name when
   // |features::kAutofillEnableSupportForMoreStructureInNames| is not enabled.
-  base::string16 given_;
-  base::string16 middle_;
-  base::string16 family_;
-  base::string16 full_;
+  std::u16string given_;
+  std::u16string middle_;
+  std::u16string family_;
+  std::u16string full_;
 
   // This data structure stores the more-structured representation of the name
   // when |features::kAutofillEnableSupportForMoreStructureInNames| is enabled.
@@ -124,17 +123,17 @@ class EmailInfo : public FormGroup {
   bool operator!=(const EmailInfo& other) const { return !operator==(other); }
 
   // FormGroup:
-  base::string16 GetRawInfo(ServerFieldType type) const override;
+  std::u16string GetRawInfo(ServerFieldType type) const override;
   void SetRawInfoWithVerificationStatus(
       ServerFieldType type,
-      const base::string16& value,
+      const std::u16string& value,
       structured_address::VerificationStatus status) override;
 
  private:
   // FormGroup:
   void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
-  base::string16 email_;
+  std::u16string email_;
 };
 
 class CompanyInfo : public FormGroup {
@@ -149,19 +148,19 @@ class CompanyInfo : public FormGroup {
   bool operator!=(const CompanyInfo& other) const { return !operator==(other); }
 
   // FormGroup:
-  base::string16 GetRawInfo(ServerFieldType type) const override;
+  std::u16string GetRawInfo(ServerFieldType type) const override;
   void SetRawInfoWithVerificationStatus(
       ServerFieldType type,
-      const base::string16& value,
+      const std::u16string& value,
       structured_address::VerificationStatus status) override;
   void set_profile(const AutofillProfile* profile) { profile_ = profile; }
 
  private:
   // FormGroup:
   void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
-  bool IsValidOrVerified(const base::string16& value) const;
+  bool IsValidOrVerified(const std::u16string& value) const;
 
-  base::string16 company_name_;
+  std::u16string company_name_;
   const AutofillProfile* profile_ = nullptr;
 };