  #if defined(OS_WIN) || defined(OS_MACOSX) || \
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
    std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
-       base::MakeUnique<password_manager::PasswordStoreSigninNotifierImpl>(
+@@ -285,6 +288,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
            profile);
    ps->SetPasswordStoreSigninNotifier(std::move(notifier));
+ #endif
 +#endif
- #endif
  
    return ps;
+ }
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
 index 9d81a019eacdbe354c8337d74e0cfb53e833ba7d..86fff6beac3022f83a0b3a88a41f0083a8273027 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc

 }
 
 PasswordStoreFactory::~PasswordStoreFactory() {}
@@ -278,12 +280,14 @@ PasswordStoreFactory::BuildServiceInstanceFor(
       ps.get(), profile->GetPrefs(),
       make_scoped_refptr(profile->GetRequestContext()));
 

index f366a941273f0807405743f1365fdaf3a549cddc..35d5a90c778adfa67597866c31a91bc79dad3ab6 100644
--- a/chrome/common/importer/profile_import.mojom
+++ b/chrome/common/importer/profile_import.mojom
@@ -16,6 +16,9 @@ struct ImportedBookmarkEntry;
 struct ImporterAutofillFormDataEntry;
 
 [Native]
+struct ImportedCookieEntry;
+
+[Native]
 struct SearchEngineInfo;
 
 [Native]
@@ -63,6 +66,8 @@ interface ProfileImportObserver {
   OnAutofillFormDataImportStart(uint32 total_autofill_form_data_entry_count);
   OnAutofillFormDataImportGroup(
