Chromium Code Reviews| Index: chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc |
| diff --git a/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc b/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc |
| index 7209458707670660d2b9742f672b7f4c65888ee7..6b0faddcb745fb03f58000bd8eb82e174e415d5a 100644 |
| --- a/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc |
| +++ b/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc |
| @@ -200,7 +200,7 @@ IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest, |
| &password_manager::CredentialInfo::type, |
| password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY))); |
| EXPECT_CALL(*controller(), OnDialogClosed()); |
| - EXPECT_TRUE(dialog->Close()); |
| + dialog->GetWidget()->Close(); |
| EXPECT_FALSE(controller()->current_autosignin_prompt()); |
| } |
| @@ -261,7 +261,7 @@ IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest, |
| &password_manager::CredentialInfo::type, |
| password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY))); |
| EXPECT_CALL(*controller(), OnDialogClosed()); |
| - EXPECT_TRUE(dialog->Close()); |
| + dialog->GetWidget()->Close(); |
| EXPECT_FALSE(controller()->current_autosignin_prompt()); |
| } |
| @@ -292,7 +292,6 @@ IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest, |
| controller()->ChooseCredential( |
| form, password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD); |
| - EXPECT_CALL(*controller(), OnDialogClosed()); |
|
vasilii
2016/02/11 10:37:48
It should be called when the autosignin dialog is
Evan Stade
2016/02/11 20:02:11
well, this is kinda janky. This wasn't being calle
vasilii
2016/02/12 12:57:09
Please don't change the production code.
The metho
|
| EXPECT_TRUE(controller()->current_autosignin_prompt()); |
| } |
| @@ -383,6 +382,7 @@ IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest, PopupAutoSigninPrompt) { |
| ui::Accelerator esc(ui::VKEY_ESCAPE, 0); |
| EXPECT_CALL(*controller(), OnDialogClosed()); |
| EXPECT_TRUE(dialog->GetWidget()->client_view()->AcceleratorPressed(esc)); |
| + content::RunAllPendingInMessageLoop(); |
|
vasilii
2016/02/11 10:37:48
Is it now async?
You can drop http://crbug.com/583
Evan Stade
2016/02/11 20:02:11
Done.
|
| testing::Mock::VerifyAndClearExpectations(controller()); |
| EXPECT_TRUE( |
| password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience( |
| @@ -433,7 +433,6 @@ IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest, |
| blocked_form.reset(new autofill::PasswordForm(form)); |
| client()->NotifyUserAutoSigninBlockedOnFirstRun(std::move(blocked_form)); |
| client()->NotifySuccessfulLoginWithExistingPassword(form); |
| - EXPECT_CALL(*controller(), OnDialogClosed()); |
|
vasilii
2016/02/11 10:37:48
Same as above
Evan Stade
2016/02/11 20:02:11
Done.
|
| ASSERT_TRUE(controller()->current_autosignin_prompt()); |
| } |