Don't compile save_password_infobar_delegate.cc everywhere but Mac and Android

chrome/browser/password_manager/chrome_password_manager_client.cc

Index: chrome/browser/password_manager/chrome_password_manager_client.cc
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index f7060ba64fdb09f646ec0401bed1afa3f686d9d6..20e2f7cec8f2fdce6cfbf1ce80a4b8f45f3bc44b 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -12,7 +12,6 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
-#include "chrome/browser/password_manager/save_password_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ -49,6 +48,10 @@
 #include "net/base/url_util.h"
 #include "third_party/re2/re2/re2.h"
 
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#include "chrome/browser/password_manager/save_password_infobar_delegate.h"
+#endif
+
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.h"
@@ -216,6 +219,7 @@ bool ChromePasswordManagerClient::PromptUserToSaveOrUpdatePassword(
       manage_passwords_ui_controller->OnPasswordSubmitted(form_to_save.Pass());
     }
   } else {
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
     if (form_to_save->IsBlacklisted())
       return false;
     std::string uma_histogram_suffix(
@@ -224,6 +228,9 @@ bool ChromePasswordManagerClient::PromptUserToSaveOrUpdatePassword(
                 form_to_save->pending_credentials().signon_realm, GetPrefs())));
     SavePasswordInfoBarDelegate::Create(
         web_contents(), form_to_save.Pass(), uma_histogram_suffix, type);
+#else
+    NOTREACHED() << "Aura platforms should always use the bubble";
+#endif
   }
   return true;
 }
@@ -506,9 +513,9 @@ bool ChromePasswordManagerClient::IsURLPasswordWebsiteReauth(
 }
 
 bool ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled() {
-#if !defined(USE_AURA) && !defined(OS_MACOSX)
+#if defined(OS_ANDROID)
   return false;
-#endif
+#elif defined(OS_MACOSX)
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableSavePasswordBubble))
     return false;
@@ -521,6 +528,10 @@ bool ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled() {
 
   // The bubble should be the default case that runs on the bots.
   return group_name != "Infobar";
+#else
+  // All other platforms use Aura, and therefore always show the bubble.
+  return true;
+#endif
 }
 
 bool ChromePasswordManagerClient::IsUpdatePasswordUIEnabled() const {