Remove DialogDelegate::OnClosed() which is redundant with

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"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/passwords/account_chooser_dialog_view.h"
 #include "chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/views/widget/widget.h"
@@ skipping 16 matching lines @@
         url, d, response_data, response_code, status));
   }
 
   MOCK_METHOD1(OnRequestDone, void(const GURL&));
 };
 
 // ManagePasswordsUIController subclass to capture the dialog instance
 class TestManagePasswordsUIController : public ManagePasswordsUIController {
  public:
   explicit TestManagePasswordsUIController(content::WebContents* web_contents);
+  ~TestManagePasswordsUIController() override;
 
   void OnDialogHidden() override;
   AccountChooserPrompt* CreateAccountChooser(
       PasswordDialogController* controller) override;
   AutoSigninFirstRunPrompt* CreateAutoSigninPrompt(
       PasswordDialogController* controller) override;
 
   AccountChooserDialogView* current_account_chooser() const {
     return static_cast<AccountChooserDialogView*>(current_account_chooser_);
   }
 
   AutoSigninFirstRunDialogView* current_autosignin_prompt() const {
     return static_cast<AutoSigninFirstRunDialogView*>(
         current_autosignin_prompt_);
   }
 
   MOCK_METHOD0(OnDialogClosed, void());
 
  private:
   AccountChooserPrompt* current_account_chooser_;
   AutoSigninFirstRunPrompt* current_autosignin_prompt_;
+  bool dialog_closed_;
 
   DISALLOW_COPY_AND_ASSIGN(TestManagePasswordsUIController);
 };
 
 TestManagePasswordsUIController::TestManagePasswordsUIController(
     content::WebContents* web_contents)
     : ManagePasswordsUIController(web_contents),
       current_account_chooser_(nullptr),
-      current_autosignin_prompt_(nullptr) {
+      current_autosignin_prompt_(nullptr),
+      dialog_closed_(false) {
   // Attach TestManagePasswordsUIController to |web_contents| so the default
   // ManagePasswordsUIController isn't created.
   // Do not silently replace an existing ManagePasswordsUIController because it
   // unregisters itself in WebContentsDestroyed().
   EXPECT_FALSE(web_contents->GetUserData(UserDataKey()));
   web_contents->SetUserData(UserDataKey(), this);
 }
 
+TestManagePasswordsUIController::~TestManagePasswordsUIController() {
+  if (!dialog_closed_)
+    OnDialogHidden();
+}
+
 void TestManagePasswordsUIController::OnDialogHidden() {
   ManagePasswordsUIController::OnDialogHidden();
   OnDialogClosed();
+  dialog_closed_ = true;
 }
 
 AccountChooserPrompt* TestManagePasswordsUIController::CreateAccountChooser(
     PasswordDialogController* controller) {
   current_account_chooser_ =
       ManagePasswordsUIController::CreateAccountChooser(controller);
   return current_account_chooser_;
 }
 
 AutoSigninFirstRunPrompt*
@@ skipping 95 matching lines @@
 
   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(*controller(), OnDialogClosed());
-  EXPECT_TRUE(dialog->Close());
+  dialog->GetWidget()->Close();
 
   EXPECT_FALSE(controller()->current_autosignin_prompt());
 }
 
 IN_PROC_BROWSER_TEST_F(
     PasswordDialogViewTest,
     PopupAccountChooserWithMultipleCredentialsReturnNonEmpty) {
   GURL origin("https://example.com");
   ScopedVector<autofill::PasswordForm> local_credentials;
   autofill::PasswordForm form;
@@ skipping 40 matching lines @@
   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(*controller(), OnDialogClosed());
-  EXPECT_TRUE(dialog->Close());
+  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");
@@ skipping 10 matching lines @@
   EXPECT_CALL(*this,
               OnChooseCredential(Field(
                   &password_manager::CredentialInfo::type,
                   password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD)));
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
   controller()->ChooseCredential(
       form, password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
 
+  EXPECT_TRUE(controller()->current_autosignin_prompt());
   EXPECT_CALL(*controller(), OnDialogClosed());
-  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;
@@ skipping 63 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest, PopupAutoSigninPrompt) {
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
   controller()->OnPromptEnableAutoSignin();
   ASSERT_TRUE(controller()->current_autosignin_prompt());
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
   AutoSigninFirstRunDialogView* dialog =
       controller()->current_autosignin_prompt();
-  // This is the way how ESC is processed. It's important to reproduce it
-  // because of double AutoSigninFirstRunDialogView::OnClosed call due to a bug
-  // http://crbug.com/583330.
   ui::Accelerator esc(ui::VKEY_ESCAPE, 0);
   EXPECT_CALL(*controller(), OnDialogClosed());
   EXPECT_TRUE(dialog->GetWidget()->client_view()->AcceleratorPressed(esc));
+  content::RunAllPendingInMessageLoop();
   testing::Mock::VerifyAndClearExpectations(controller());
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
                        PopupAutoSigninPromptAfterBlockedZeroclick) {
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
@@ skipping 30 matching lines @@
   client()->NotifyUserAutoSigninBlockedOnFirstRun(std::move(blocked_form));
   client()->NotifySuccessfulLoginWithExistingPassword(form);
   ASSERT_FALSE(controller()->current_autosignin_prompt());
   browser()->profile()->GetPrefs()->SetBoolean(
       password_manager::prefs::kCredentialsEnableAutosignin, true);
 
   // Successful login with the same form after block will prompt:
   blocked_form.reset(new autofill::PasswordForm(form));
   client()->NotifyUserAutoSigninBlockedOnFirstRun(std::move(blocked_form));
   client()->NotifySuccessfulLoginWithExistingPassword(form);
+  ASSERT_TRUE(controller()->current_autosignin_prompt());
+
   EXPECT_CALL(*controller(), OnDialogClosed());
-  ASSERT_TRUE(controller()->current_autosignin_prompt());
 }
 
 }  // namespace