Update the |skip_zero_click| flag of a credential when selected in the account chooser.

chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc

 // Copyright 2016 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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 104 matching lines @@
 
   content::WebContents* SetupTabWithTestController(Browser* browser);
 
   TestManagePasswordsUIController* controller() const { return controller_; }
 
   ChromePasswordManagerClient* client() const {
     return ChromePasswordManagerClient::FromWebContents(
         browser()->tab_strip_model()->GetActiveWebContents());
   }
 
-  MOCK_METHOD1(OnChooseCredential,
-               void(const password_manager::CredentialInfo&));
+  MOCK_METHOD1(OnChooseCredential, void(const autofill::PasswordForm*));
 
  private:
   TestManagePasswordsUIController* controller_;
 };
 
 void PasswordDialogViewTest::SetUpOnMainThread() {
   SetupTabWithTestController(browser());
 }
 
 void PasswordDialogViewTest::SetupChooseCredentials(
@@ skipping 52 matching lines @@
       NULL, base::Bind(&TestURLFetcherCallback::CreateURLFetcher,
                        base::Unretained(&url_callback)));
   factory.SetFakeResponse(icon_url, std::string(), net::HTTP_OK,
                           net::URLRequestStatus::FAILED);
   EXPECT_CALL(url_callback, OnRequestDone(icon_url));
 
   SetupChooseCredentials(std::move(local_credentials),
                          ScopedVector<autofill::PasswordForm>(), origin);
   ASSERT_TRUE(controller()->current_account_chooser());
   AccountChooserDialogView* dialog = controller()->current_account_chooser();
-  EXPECT_CALL(*this,
-              OnChooseCredential(Field(
-                  &password_manager::CredentialInfo::type,
-                  password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY)));
+  EXPECT_CALL(*this, OnChooseCredential(nullptr));
   EXPECT_CALL(*controller(), OnDialogClosed());
   dialog->GetWidget()->Close();
 
   EXPECT_FALSE(controller()->current_autosignin_prompt());
 }
 
 IN_PROC_BROWSER_TEST_F(
     PasswordDialogViewTest,
     PopupAccountChooserWithMultipleCredentialsReturnNonEmpty) {
   GURL origin("https://example.com");
@@ skipping 10 matching lines @@
   form.federation_origin = url::Origin(GURL("https://google.com/federation"));
   local_credentials.push_back(new autofill::PasswordForm(form));
 
   SetupChooseCredentials(std::move(local_credentials),
                          ScopedVector<autofill::PasswordForm>(), origin);
   ASSERT_TRUE(controller()->current_account_chooser());
 
   // After picking a credential, we should pass it back to the caller via the
   // callback, but we should not pop up the autosignin prompt as there were
   // multiple credentials available.
-  EXPECT_CALL(
-      *this, OnChooseCredential(Field(
-                 &password_manager::CredentialInfo::type,
-                 password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED)));
+  EXPECT_CALL(*this, OnChooseCredential(testing::Pointee(form)));
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
   controller()->ChooseCredential(
       form, password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
   EXPECT_FALSE(controller()->current_autosignin_prompt());
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
                        PopupAccountChooserWithSingleCredentialReturnEmpty) {
   GURL origin("https://example.com");
   ScopedVector<autofill::PasswordForm> local_credentials;
   autofill::PasswordForm form;
   form.origin = origin;
   form.display_name = base::ASCIIToUTF16("Peter");
   form.username_value = base::ASCIIToUTF16("peter@pan.test");
   local_credentials.push_back(new autofill::PasswordForm(form));
 
   SetupChooseCredentials(std::move(local_credentials),
                          ScopedVector<autofill::PasswordForm>(), origin);
 
   EXPECT_TRUE(controller()->current_account_chooser());
   AccountChooserDialogView* dialog = controller()->current_account_chooser();
-  EXPECT_CALL(*this,
-              OnChooseCredential(Field(
-                  &password_manager::CredentialInfo::type,
-                  password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY)));
+  EXPECT_CALL(*this, OnChooseCredential(nullptr));
   EXPECT_CALL(*controller(), OnDialogClosed());
   dialog->GetWidget()->Close();
   EXPECT_FALSE(controller()->current_autosignin_prompt());
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
                        PopupAccountChooserWithSingleCredentialReturnNonEmpty) {
   GURL origin("https://example.com");
   ScopedVector<autofill::PasswordForm> local_credentials;
   autofill::PasswordForm form;
   form.origin = origin;
   form.display_name = base::ASCIIToUTF16("Peter");
   form.username_value = base::ASCIIToUTF16("peter@pan.test");
   local_credentials.push_back(new autofill::PasswordForm(form));
 
   SetupChooseCredentials(std::move(local_credentials),
                          ScopedVector<autofill::PasswordForm>(), origin);
 
   EXPECT_TRUE(controller()->current_account_chooser());
 
   // After picking a credential, we should pass it back to the caller via the
   // callback, and pop up the autosignin prompt iff we should show it.
-  EXPECT_CALL(*this,
-              OnChooseCredential(Field(
-                  &password_manager::CredentialInfo::type,
-                  password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD)));
+  EXPECT_CALL(*this, OnChooseCredential(testing::Pointee(form)));
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
   controller()->ChooseCredential(
       form, password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
 
   EXPECT_TRUE(controller()->current_autosignin_prompt());
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
                        PopupAccountChooserWithDisabledAutoSignin) {
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
   GURL origin("https://example.com");
   ScopedVector<autofill::PasswordForm> local_credentials;
   autofill::PasswordForm form;
   form.origin = origin;
   form.display_name = base::ASCIIToUTF16("Peter");
   form.username_value = base::ASCIIToUTF16("peter@pan.test");
   local_credentials.push_back(new autofill::PasswordForm(form));
 
   SetupChooseCredentials(std::move(local_credentials),
                          ScopedVector<autofill::PasswordForm>(), origin);
 
   EXPECT_TRUE(controller()->current_account_chooser());
 
   // After picking a credential, we should pass it back to the caller via the
   // callback, and pop up the autosignin prompt iff we should show it.
-  EXPECT_CALL(*this,
-              OnChooseCredential(Field(
-                  &password_manager::CredentialInfo::type,
-                  password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD)));
+  EXPECT_CALL(*this, OnChooseCredential(testing::Pointee(form)));
   browser()->profile()->GetPrefs()->SetBoolean(
       password_manager::prefs::kCredentialsEnableAutosignin, false);
   controller()->ChooseCredential(
       form, password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
 
   // The first run experience isn't shown because the setting is off.
   EXPECT_FALSE(controller()->current_autosignin_prompt());
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
@@ skipping 17 matching lines @@
   ChromePasswordManagerClient* client =
       ChromePasswordManagerClient::FromWebContents(tab);
   client->PromptUserToChooseCredentials(
       std::move(local_credentials), ScopedVector<autofill::PasswordForm>(),
       origin,
       base::Bind(&PasswordDialogViewTest::OnChooseCredential, this));
   EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
             controller()->GetState());
   EXPECT_TRUE(controller()->current_account_chooser());
 
-  EXPECT_CALL(*this,
-              OnChooseCredential(Field(
-                  &password_manager::CredentialInfo::type,
-                  password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD)));
+  EXPECT_CALL(*this, OnChooseCredential(testing::Pointee(form)));
   controller()->ChooseCredential(
       form, password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
 
   // The first run experience isn't shown because of Incognito.
   EXPECT_FALSE(controller()->current_autosignin_prompt());
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest, PopupAutoSigninPrompt) {
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
@@ skipping 54 matching lines @@
       password_manager::prefs::kCredentialsEnableAutosignin, true);
 
   // Successful login with the same form after block will prompt:
   blocked_form.reset(new autofill::PasswordForm(form));
   client()->NotifyUserCouldBeAutoSignedIn(std::move(blocked_form));
   client()->NotifySuccessfulLoginWithExistingPassword(form);
   ASSERT_TRUE(controller()->current_autosignin_prompt());
 }
 
 }  // namespace