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

chrome/browser/ui/passwords/manage_passwords_state_unittest.cc

 // Copyright 2015 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/ui/passwords/manage_passwords_state.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
 #include "components/password_manager/core/browser/stub_password_manager_driver.h"
-#include "components/password_manager/core/common/credential_manager_types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 using ::testing::_;
 using ::testing::Contains;
 using ::testing::ElementsAre;
 using ::testing::IsEmpty;
 using ::testing::Not;
@@ skipping 51 matching lines @@
   // Pushes irrelevant updates to |passwords_data_| and checks that they don't
   // affect the state.
   void TestNoisyUpdates();
 
   // Pushes both relevant and irrelevant updates to |passwords_data_|.
   void TestAllUpdates();
 
   // Pushes a blacklisted form and checks that it doesn't affect the state.
   void TestBlacklistedUpdates();
 
-  MOCK_METHOD1(CredentialCallback,
-               void(const password_manager::CredentialInfo&));
+  MOCK_METHOD1(CredentialCallback, void(const autofill::PasswordForm*));
 
  private:
   // Implements both CreateFormManager and CreateFormManagerWithFederation.
   scoped_ptr<password_manager::PasswordFormManager> CreateFormManagerInternal(
       bool include_federated);
 
   password_manager::StubPasswordManagerClient stub_client_;
   password_manager::StubPasswordManagerDriver driver_;
   password_manager::PasswordManager password_manager_;
 
@@ skipping 233 matching lines @@
       &ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               ElementsAre(Pointee(test_local_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(),
               ElementsAre(Pointee(test_federated_form())));
   EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
             passwords_data().state());
   EXPECT_EQ(origin, passwords_data().origin());
   TestAllUpdates();
 
-  password_manager::CredentialInfo credential_info(
-      test_local_form(),
-      password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
-  EXPECT_CALL(*this, CredentialCallback(_))
-      .WillOnce(testing::SaveArg<0>(&credential_info));
+  EXPECT_CALL(*this, CredentialCallback(nullptr));
   passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
-  EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY,
-            credential_info.type);
   EXPECT_TRUE(passwords_data().credentials_callback().is_null());
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               ElementsAre(Pointee(test_local_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
   EXPECT_EQ(origin, passwords_data().origin());
   TestAllUpdates();
 }
 
 TEST_F(ManagePasswordsStateTest, AutoSignin) {
@@ skipping 295 matching lines @@
                                    Pointee(test_local_federated_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
 }
 
 TEST_F(ManagePasswordsStateTest, ChooseCredentialLocal) {
   passwords_data().OnRequestCredentials(ScopedVector<autofill::PasswordForm>(),
                                         ScopedVector<autofill::PasswordForm>(),
                                         test_local_form().origin);
   passwords_data().set_credentials_callback(base::Bind(
       &ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
-  password_manager::CredentialInfo credential_info(
-      test_local_form(),
-      password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
-  EXPECT_CALL(*this, CredentialCallback(credential_info));
-  passwords_data().ChooseCredential(
-      test_local_form(),
-      password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
+  EXPECT_CALL(*this, CredentialCallback(&test_local_form()));
+  passwords_data().ChooseCredential(&test_local_form());
 }
 
-TEST_F(ManagePasswordsStateTest, ChooseCredentialFederated) {
+TEST_F(ManagePasswordsStateTest, ChooseCredentialEmpty) {
   passwords_data().OnRequestCredentials(ScopedVector<autofill::PasswordForm>(),
                                         ScopedVector<autofill::PasswordForm>(),
                                         test_local_form().origin);
   passwords_data().set_credentials_callback(base::Bind(
       &ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
   password_manager::CredentialInfo credential_info(
       test_federated_form(),
-      password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED);
-  EXPECT_CALL(*this, CredentialCallback(credential_info));
-  passwords_data().ChooseCredential(
-      test_federated_form(),
-      password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED);
-}
-
-TEST_F(ManagePasswordsStateTest, ChooseCredentialEmpty) {
-  passwords_data().OnRequestCredentials(ScopedVector<autofill::PasswordForm>(),
-                                        ScopedVector<autofill::PasswordForm>(),
-                                        test_local_form().origin);
-  autofill::PasswordForm password_form(test_local_form());
-  passwords_data().set_credentials_callback(base::Bind(
-      &ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
-  password_manager::CredentialInfo credential_info(
-      test_federated_form(),
       password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
-  EXPECT_CALL(*this, CredentialCallback(credential_info));
-  passwords_data().ChooseCredential(
-      test_federated_form(),
-      password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
+  EXPECT_CALL(*this, CredentialCallback(nullptr));
+  passwords_data().ChooseCredential(nullptr);
 }
 
 TEST_F(ManagePasswordsStateTest, ChooseCredentialLocalWithNonEmptyFederation) {
   passwords_data().OnRequestCredentials(ScopedVector<autofill::PasswordForm>(),
                                         ScopedVector<autofill::PasswordForm>(),
                                         test_local_form().origin);
-  autofill::PasswordForm form(test_federated_form());
-  form.federation_origin = url::Origin(GURL("https://federation.test/"));
   passwords_data().set_credentials_callback(base::Bind(
       &ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
-  password_manager::CredentialInfo credential_info(
-      form, password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED);
-  EXPECT_CALL(*this, CredentialCallback(credential_info));
-  passwords_data().ChooseCredential(
-      form, password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
+  EXPECT_CALL(*this, CredentialCallback(&test_local_federated_form()));
+  passwords_data().ChooseCredential(&test_local_federated_form());
 }
 
 }  // namespace