1 files changed, 8 insertions, 3 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 868595ac103..818dbed3b7e 100644
--- a/chromium/components/autofill/core/browser/data_model/contact_info.h
+++ b/chromium/components/autofill/core/browser/data_model/contact_info.h
@@ -5,6 +5,7 @@
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_MODEL_CONTACT_INFO_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_MODEL_CONTACT_INFO_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -31,6 +32,10 @@ class NameInfo : public FormGroup {
   // FormGroup:
   base::string16 GetRawInfo(ServerFieldType type) const override;
 
+  void GetMatchingTypes(const base::string16& text,
+                        const std::string& app_locale,
+                        ServerFieldTypeSet* matching_types) const override;
+
   void SetRawInfoWithVerificationStatus(
       ServerFieldType type,
       const base::string16& value,
@@ -65,8 +70,8 @@ class NameInfo : public FormGroup {
   void MergeStructuredNameValidationStatuses(const NameInfo& newer);
 
   // Returns a constant reference to the structured name tree.
-  const structured_address::NameFull& GetStructuredName() const {
-    return name_;
+  const structured_address::AddressComponent& GetStructuredName() const {
+    return *name_;
   }
 
  private:
@@ -105,7 +110,7 @@ class NameInfo : public FormGroup {
 
   // This data structure stores the more-structured representation of the name
   // when |features::kAutofillEnableSupportForMoreStructureInNames| is enabled.
-  structured_address::NameFull name_;
+  const std::unique_ptr<structured_address::AddressComponent> name_;
 };
 
 class EmailInfo : public FormGroup {