  #if defined(OS_WIN) || defined(OS_MACOSX) || \
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
    std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
-@@ -271,6 +274,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 e1d7bcd79da69a0de720df05dd1f8ce307b3d146..25decc50a030b09c15b6784d0e90c7194a7b0e82 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc

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

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