  }
  
  PasswordStoreFactory::~PasswordStoreFactory() {}
-@@ -264,6 +266,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
+@@ -264,12 +266,14 @@ PasswordStoreFactory::BuildServiceInstanceFor(
        ps.get(), profile->GetPrefs(),
        base::WrapRefCounted(profile->GetRequestContext()));
  

index d5fa210c58244a5c9bc2aed4fa80d903920f604e..3f24c00ba2024fb1a6553d4fc69dae5f71c4d08c 100644
--- a/chrome/common/importer/profile_import.mojom
+++ b/chrome/common/importer/profile_import.mojom
@@ -18,6 +18,9 @@ struct ImportedBookmarkEntry;
 struct ImporterAutofillFormDataEntry;
 
 [Native]
+struct ImportedCookieEntry;
+
+[Native]
 struct SearchEngineInfo;
 
 [Native]
@@ -65,6 +68,8 @@ interface ProfileImportObserver {
   OnAutofillFormDataImportStart(uint32 total_autofill_form_data_entry_count);
   OnAutofillFormDataImportGroup(

 
 process_version("version_header") {
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index d4e0823a55994118bacfe4fd7f8ec1881640e8ac..3644624a60bc75b5d6308c30343a25793ccff589 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -10,11 +10,11 @@
