Add a test for the "Sign in" button in the account chooser on Views.

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 23 matching lines @@
       net::HttpStatusCode response_code,
       net::URLRequestStatus::Status status) {
     OnRequestDone(url);
     return std::unique_ptr<net::FakeURLFetcher>(
         new net::FakeURLFetcher(url, d, response_data, response_code, status));
   }
 
   MOCK_METHOD1(OnRequestDone, void(const GURL&));
 };
 
+// A Widget observer class used to observe bubbles closing.
+class BubbleCloseObserver : public views::WidgetObserver {
+ public:
+  explicit BubbleCloseObserver(views::DialogDelegateView* bubble);
+  ~BubbleCloseObserver() override;
+
+  bool widget_closed() const { return widget_ == NULL; }

[vabr (Chromium), 2016/05/23 14:09:13]

nit: nullptr
Also on line 74.

[vasilii, 2016/05/23 14:15:46]

Done.

+
+ private:
+  // WidgetObserver:
+  void OnWidgetClosing(views::Widget* widget) override;
+
+  views::Widget* widget_;
+
+  DISALLOW_COPY_AND_ASSIGN(BubbleCloseObserver);
+};
+
+BubbleCloseObserver::BubbleCloseObserver(views::DialogDelegateView* bubble)
+    : widget_(bubble->GetWidget()) {
+  widget_->AddObserver(this);
+}
+
+BubbleCloseObserver::~BubbleCloseObserver() {
+  if (widget_)
+    widget_->RemoveObserver(this);
+}
+
+void BubbleCloseObserver::OnWidgetClosing(views::Widget* widget) {
+  DCHECK_EQ(widget_, widget);
+  widget_->RemoveObserver(this);
+  widget_ = NULL;
+}
+
 // ManagePasswordsUIController subclass to capture the dialog instance
 class TestManagePasswordsUIController : public ManagePasswordsUIController {
  public:
   explicit TestManagePasswordsUIController(content::WebContents* web_contents);
 
   void OnDialogHidden() override;
   AccountChooserPrompt* CreateAccountChooser(
       PasswordDialogController* controller) override;
   AutoSigninFirstRunPrompt* CreateAutoSigninPrompt(
       PasswordDialogController* controller) override;
@@ skipping 196 matching lines @@
 
   EXPECT_TRUE(controller()->current_account_chooser());
   AccountChooserDialogView* dialog = controller()->current_account_chooser();
   EXPECT_CALL(*this, OnChooseCredential(nullptr));
   EXPECT_CALL(*controller(), OnDialogClosed());
   dialog->GetWidget()->Close();
   EXPECT_FALSE(controller()->current_autosignin_prompt());
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
+                       PopupAccountChooserWithSingleCredentialClickSignIn) {
+  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());
+  views::DialogDelegateView* dialog = controller()->current_account_chooser();
+  BubbleCloseObserver bubble_observer(dialog);
+  EXPECT_CALL(*this, OnChooseCredential(testing::Pointee(form)));
+  dialog->Accept();
+  EXPECT_TRUE(bubble_observer.widget_closed());
+}
+
+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),
@@ skipping 81 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();
+  BubbleCloseObserver bubble_observer(dialog);
   ui::Accelerator esc(ui::VKEY_ESCAPE, 0);
   EXPECT_CALL(*controller(), OnDialogClosed());
   EXPECT_TRUE(dialog->GetWidget()->client_view()->AcceleratorPressed(esc));
+  EXPECT_TRUE(bubble_observer.widget_closed());
   content::RunAllPendingInMessageLoop();
   testing::Mock::VerifyAndClearExpectations(controller());
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
                        PopupAutoSigninPromptAfterBlockedZeroclick) {
   EXPECT_TRUE(
@@ skipping 35 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