  #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(
+       base::MakeUnique<password_manager::PasswordStoreSigninNotifierImpl>(
            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

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

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