[Password Manager] Update Confirmation UI for saved password change for Chrome on Android.

chrome/browser/password_manager/chrome_password_manager_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 47 matching lines @@
 #include "third_party/re2/src/re2/re2.h"
 
 #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI)
 #include "chrome/browser/password_manager/save_password_infobar_delegate.h"
 #endif
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 #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
 
 using password_manager::ContentPasswordManagerDriverFactory;
 using password_manager::PasswordManagerInternalsService;
 
 // Shorten the name to spare line breaks. The code provides enough context
 // already.
 typedef autofill::SavePasswordProgressLogger Logger;
 
@@ skipping 153 matching lines @@
           std::move(form_to_save));
     } else {
       manage_passwords_ui_controller->OnPasswordSubmitted(
           std::move(form_to_save));
     }
 #endif
   } else {
 #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI)
     if (form_to_save->IsBlacklisted())
       return false;
+    if (update_password && IsUpdatePasswordUIEnabled()) {
+#if BUILDFLAG(ANDROID_JAVA_UI)
+      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
   }
   return true;
 }
 
 bool ChromePasswordManagerClient::PromptUserToChooseCredentials(
     ScopedVector<autofill::PasswordForm> local_forms,
     ScopedVector<autofill::PasswordForm> federated_forms,
@@ skipping 248 matching lines @@
 }
 
 bool ChromePasswordManagerClient::IsUpdatePasswordUIEnabled() const {
 #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)
+  return base::FeatureList::IsEnabled(
+      password_manager::features::kEnablePasswordChangeSupport);
 #else
   return IsTheHotNewBubbleUIEnabled();
 #endif
 }
 
 bool ChromePasswordManagerClient::EnabledForSyncSignin() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(
           password_manager::switches::kDisableManagerForSyncSignin))
     return false;
@@ skipping 24 matching lines @@
 
 const password_manager::CredentialsFilter*
 ChromePasswordManagerClient::GetStoreResultFilter() const {
   return &credentials_filter_;
 }
 
 const password_manager::LogManager* ChromePasswordManagerClient::GetLogManager()
     const {
   return log_manager_.get();
 }