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

   return nullptr;
 }
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index b01ed855a22dbf49d15c793a0b200310d8469b24..7a4ed2f17d4b499691bf6ddf451341eec7a580ff 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -853,7 +853,7 @@ if (!is_android) {

 #if defined(OS_WIN) || defined(OS_MACOSX) || \
     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
@@ -285,6 +288,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
           profile);
   ps->SetPasswordStoreSigninNotifier(std::move(notifier));
 #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
