CREDENTIAL: Only toggle 'skip_zero_click' state if API is used.

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 306 matching lines @@
   DCHECK(!local_forms.empty());
 #if BUILDFLAG(ANDROID_JAVA_UI)
   ShowAutoSigninPrompt(web_contents(), local_forms[0]->username_value);
 #else
   PasswordsClientUIDelegateFromWebContents(web_contents())
       ->OnAutoSignin(std::move(local_forms));
 
 #endif
 }
 
-void ChromePasswordManagerClient::NotifyUserAutoSigninBlockedOnFirstRun(
+void ChromePasswordManagerClient::NotifyUserCouldBeAutoSignedIn(
     scoped_ptr<autofill::PasswordForm> form) {
-  DCHECK(
-      password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
-          GetPrefs()));
-  form_blocked_on_first_run_ = std::move(form);
+  possible_auto_sign_in_ = std::move(form);
 }
 
 void ChromePasswordManagerClient::NotifySuccessfulLoginWithExistingPassword(
     const autofill::PasswordForm& form) {
-  if (form.skip_zero_click &&
-      credential_manager_dispatcher_.IsZeroClickAllowed() &&
-      GetPasswordStore()) {
-    autofill::PasswordForm update(form);
-    update.skip_zero_click = false;
-    GetPasswordStore()->UpdateLogin(update);
-  }
-
-  if (!form_blocked_on_first_run_)
+  if (!possible_auto_sign_in_)
     return;
 
-  if (form_blocked_on_first_run_->username_value == form.username_value &&
-      form_blocked_on_first_run_->password_value == form.password_value &&
-      form_blocked_on_first_run_->origin == form.origin) {
+  if (possible_auto_sign_in_->username_value == form.username_value &&
+      possible_auto_sign_in_->password_value == form.password_value &&
+      possible_auto_sign_in_->origin == form.origin) {
     PromptUserToEnableAutosigninIfNecessary();
+    if (form.skip_zero_click &&
+        credential_manager_dispatcher_.IsZeroClickAllowed() &&
+        GetPasswordStore()) {
+      autofill::PasswordForm update(form);
+      update.skip_zero_click = false;
+      GetPasswordStore()->UpdateLogin(update);
+    }
   }
-  form_blocked_on_first_run_.reset();
+  possible_auto_sign_in_.reset();
 }
 
 void ChromePasswordManagerClient::AutomaticPasswordSave(
     scoped_ptr<password_manager::PasswordFormManager> saved_form) {
 #if BUILDFLAG(ANDROID_JAVA_UI)
   GeneratedPasswordSavedInfoBarDelegateAndroid::Create(web_contents());
 #else
   if (IsTheHotNewBubbleUIEnabled()) {
     PasswordsClientUIDelegate* manage_passwords_ui_controller =
         PasswordsClientUIDelegateFromWebContents(web_contents());
@@ skipping 267 matching lines @@
 
 const password_manager::CredentialsFilter*
 ChromePasswordManagerClient::GetStoreResultFilter() const {
   return &credentials_filter_;
 }
 
 const password_manager::LogManager* ChromePasswordManagerClient::GetLogManager()
     const {
   return log_manager_.get();
 }