[Password Manager] Update Confirmation UI for saved password change for Chrome on 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 1ddedc29c5d748a6448e2725c815825ba7831a3b..5881e3edb1a6fa2b03e55bf4d0dfd61666db0f8b 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -65,6 +65,7 @@
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/password_manager/account_chooser_dialog_android.h"
 #include "chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.h"
+#include "chrome/browser/password_manager/update_password_infobar_delegate.h"
 #include "chrome/browser/ui/android/snackbars/auto_signin_prompt_controller.h"
 #endif
 
@@ -223,6 +224,8 @@ bool ChromePasswordManagerClient::PromptUserToSaveOrUpdatePassword(
     return false;
   }
 
+  LOG(ERROR) << "PromptUserToSaveOrUpdatePassword";

[gone, 2016/01/26 19:59:22]

Remove all these debugging logs.

[melandory, 2016/01/29 15:56:14]

Done.

+
   if (IsTheHotNewBubbleUIEnabled()) {
 #if !BUILDFLAG(ANDROID_JAVA_UI)
     PasswordsClientUIDelegate* manage_passwords_ui_controller =
@@ -236,15 +239,26 @@ bool ChromePasswordManagerClient::PromptUserToSaveOrUpdatePassword(
     }
 #endif
   } else {
+    LOG(ERROR) << "Not bubble UI";
 #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI)
     if (form_to_save->IsBlacklisted())
       return false;
-    std::string uma_histogram_suffix(
-        password_manager::metrics_util::GroupIdToString(
-            password_manager::metrics_util::MonitoredDomainGroupId(
-                form_to_save->pending_credentials().signon_realm, GetPrefs())));
-    SavePasswordInfoBarDelegate::Create(web_contents(), std::move(form_to_save),
-                                        uma_histogram_suffix);
+    LOG(ERROR) << "Is update " << update_password << " "
+               << IsUpdatePasswordUIEnabled();
+    if (update_password && IsUpdatePasswordUIEnabled()) {
+#if BUILDFLAG(ANDROID_JAVA_UI)

[gone, 2016/01/26 19:59:22]

This branch won't do anything at all if ANDROID_JAVA_UI isn't set, but OS_MACOSX
is.  Can you enter this branch if you're on MACOSX?  Did you want the #ifdef to
include the condition, as well?

[melandory, 2016/01/29 15:56:14]

Done.

+      UpdatePasswordInfoBarDelegate::Create(web_contents(),
+                                            std::move(form_to_save));
+#endif
+    } else {
+      std::string uma_histogram_suffix(
+          password_manager::metrics_util::GroupIdToString(
+              password_manager::metrics_util::MonitoredDomainGroupId(
+                  form_to_save->pending_credentials().signon_realm,
+                  GetPrefs())));
+      SavePasswordInfoBarDelegate::Create(
+          web_contents(), std::move(form_to_save), uma_histogram_suffix);
+    }
 #else
     NOTREACHED() << "Aura platforms should always use the bubble";
 #endif
@@ -506,8 +520,22 @@ bool ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled() {
 }
 
 bool ChromePasswordManagerClient::IsUpdatePasswordUIEnabled() const {
-  // Currently Password update UI is implemented only for Bubble UI.
+#if defined(OS_MACOSX)
+  if (!ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    // Currently Password update UI is implemented only for Bubble UI.
+    return false;
+  }
+  return base::FeatureList::IsEnabled(
+      password_manager::features::kEnablePasswordChangeSupport);
+#elif BUILDFLAG(ANDROID_JAVA_UI)
+  LOG(ERROR) << "IsUpdatePasswordUIEnabled "
+             << base::FeatureList::IsEnabled(
+                    password_manager::features::kEnablePasswordChangeSupport);
+  return base::FeatureList::IsEnabled(
+      password_manager::features::kEnablePasswordChangeSupport);
+#else
   return IsTheHotNewBubbleUIEnabled();
+#endif
 }
 
 bool ChromePasswordManagerClient::EnabledForSyncSignin() {