| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <utility> | 5 #include <utility> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 ASSERT_TRUE(credential_info()); | 598 ASSERT_TRUE(credential_info()); |
| 599 EXPECT_TRUE(credential_info()->federation.unique()); | 599 EXPECT_TRUE(credential_info()->federation.unique()); |
| 600 EXPECT_TRUE(credential_info()->password.empty()); | 600 EXPECT_TRUE(credential_info()->password.empty()); |
| 601 EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY, | 601 EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY, |
| 602 credential_info()->type); | 602 credential_info()->type); |
| 603 } | 603 } |
| 604 | 604 |
| 605 TEST_F(ManagePasswordsUIControllerTest, AutoSignin) { | 605 TEST_F(ManagePasswordsUIControllerTest, AutoSignin) { |
| 606 ScopedVector<autofill::PasswordForm> local_credentials; | 606 ScopedVector<autofill::PasswordForm> local_credentials; |
| 607 local_credentials.push_back(new autofill::PasswordForm(test_local_form())); | 607 local_credentials.push_back(new autofill::PasswordForm(test_local_form())); |
| 608 controller()->OnAutoSignin(std::move(local_credentials)); | 608 controller()->OnAutoSignin(std::move(local_credentials), |
| 609 test_local_form().origin); |
| 609 EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, controller()->GetState()); | 610 EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, controller()->GetState()); |
| 610 EXPECT_EQ(test_local_form().origin, controller()->GetOrigin()); | 611 EXPECT_EQ(test_local_form().origin, controller()->GetOrigin()); |
| 611 ASSERT_FALSE(controller()->GetCurrentForms().empty()); | 612 ASSERT_FALSE(controller()->GetCurrentForms().empty()); |
| 612 EXPECT_EQ(test_local_form(), *controller()->GetCurrentForms()[0]); | 613 EXPECT_EQ(test_local_form(), *controller()->GetCurrentForms()[0]); |
| 613 ExpectIconStateIs(password_manager::ui::AUTO_SIGNIN_STATE); | 614 ExpectIconStateIs(password_manager::ui::AUTO_SIGNIN_STATE); |
| 614 controller()->OnBubbleHidden(); | 615 controller()->OnBubbleHidden(); |
| 615 ExpectIconAndControllerStateIs(password_manager::ui::MANAGE_STATE); | 616 ExpectIconAndControllerStateIs(password_manager::ui::MANAGE_STATE); |
| 616 } | 617 } |
| 617 | 618 |
| 618 TEST_F(ManagePasswordsUIControllerTest, AutoSigninFirstRun) { | 619 TEST_F(ManagePasswordsUIControllerTest, AutoSigninFirstRun) { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 content::FrameNavigateParams params; | 662 content::FrameNavigateParams params; |
| 662 params.transition = ui::PAGE_TRANSITION_LINK; | 663 params.transition = ui::PAGE_TRANSITION_LINK; |
| 663 controller()->DidNavigateMainFrame(content::LoadCommittedDetails(), params); | 664 controller()->DidNavigateMainFrame(content::LoadCommittedDetails(), params); |
| 664 ASSERT_TRUE(testing::Mock::VerifyAndClearExpectations(&dialog_prompt())); | 665 ASSERT_TRUE(testing::Mock::VerifyAndClearExpectations(&dialog_prompt())); |
| 665 EXPECT_CALL(dialog_prompt(), ControllerGone()); | 666 EXPECT_CALL(dialog_prompt(), ControllerGone()); |
| 666 } | 667 } |
| 667 | 668 |
| 668 TEST_F(ManagePasswordsUIControllerTest, AutofillDuringAutoSignin) { | 669 TEST_F(ManagePasswordsUIControllerTest, AutofillDuringAutoSignin) { |
| 669 ScopedVector<autofill::PasswordForm> local_credentials; | 670 ScopedVector<autofill::PasswordForm> local_credentials; |
| 670 local_credentials.push_back(new autofill::PasswordForm(test_local_form())); | 671 local_credentials.push_back(new autofill::PasswordForm(test_local_form())); |
| 671 controller()->OnAutoSignin(std::move(local_credentials)); | 672 controller()->OnAutoSignin(std::move(local_credentials), |
| 673 test_local_form().origin); |
| 672 ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE); | 674 ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE); |
| 673 scoped_ptr<autofill::PasswordForm> test_form( | 675 scoped_ptr<autofill::PasswordForm> test_form( |
| 674 new autofill::PasswordForm(test_local_form())); | 676 new autofill::PasswordForm(test_local_form())); |
| 675 autofill::PasswordFormMap map; | 677 autofill::PasswordFormMap map; |
| 676 base::string16 kTestUsername = test_form->username_value; | 678 base::string16 kTestUsername = test_form->username_value; |
| 677 map.insert(std::make_pair(kTestUsername, std::move(test_form))); | 679 map.insert(std::make_pair(kTestUsername, std::move(test_form))); |
| 678 controller()->OnPasswordAutofilled(map, map.begin()->second->origin, nullptr); | 680 controller()->OnPasswordAutofilled(map, map.begin()->second->origin, nullptr); |
| 679 | 681 |
| 680 ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE); | 682 ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE); |
| 681 } | 683 } |
| (...skipping 25 matching lines...) Expand all Loading... |
| 707 CreateFormManager()); | 709 CreateFormManager()); |
| 708 test_form_manager->ProvisionallySave( | 710 test_form_manager->ProvisionallySave( |
| 709 test_local_form(), | 711 test_local_form(), |
| 710 password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES); | 712 password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES); |
| 711 controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager)); | 713 controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager)); |
| 712 | 714 |
| 713 ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE); | 715 ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE); |
| 714 controller()->UpdatePassword(autofill::PasswordForm()); | 716 controller()->UpdatePassword(autofill::PasswordForm()); |
| 715 ExpectIconStateIs(password_manager::ui::MANAGE_STATE); | 717 ExpectIconStateIs(password_manager::ui::MANAGE_STATE); |
| 716 } | 718 } |
| OLD | NEW |