Ignore OnBubbleHidden() event when the password bubble is reopened.

chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index d5c71789b7a59806ae41f1c5c432a9db3938ec91..a8a3037a9790b4fb87c530bb5d85528594ef1ff9 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h"
 #include "chrome/browser/ui/passwords/password_dialog_controller.h"
 #include "chrome/browser/ui/passwords/password_dialog_prompts.h"
+#include "chrome/browser/ui/passwords/passwords_model_delegate.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/common/password_form.h"
@@ -122,6 +123,8 @@ void TestManagePasswordsUIController::UpdateBubbleAndIconVisibility() {
   opened_bubble_ = IsAutomaticallyOpeningBubble();
   ManagePasswordsUIController::UpdateBubbleAndIconVisibility();
   OnUpdateBubbleAndIconVisibility();
+  TestManagePasswordsIconView view;
+  UpdateIconAndBubbleState(&view);
   if (opened_bubble_)
     OnBubbleShown();
 }
@@ -743,3 +746,26 @@ TEST_F(ManagePasswordsUIControllerTest, UpdatePendingStatePasswordAutofilled) {
 TEST_F(ManagePasswordsUIControllerTest, ConfirmationStatePasswordAutofilled) {
   TestNotChangingStateOnAutofill(password_manager::ui::CONFIRMATION_STATE);
 }
+
+TEST_F(ManagePasswordsUIControllerTest, OpenBubbleTwice) {
+  // Open the autosignin bubble.
+  ScopedVector<autofill::PasswordForm> local_credentials;

[sky, 2016/08/12 16:59:35]

ScopedVector is deprecated, use std::vector<std::unique_ptr>. But I see you need
it for OnAutoSignin. It would be good if this code could be converted.

[vasilii, 2016/08/12 17:26:42]

We have a tracking bug for this http://crbug.com/555132
I'll convert this part of the code soon.

+  local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
+  EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
+  controller()->OnAutoSignin(std::move(local_credentials),
+                             test_local_form().origin);
+  EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, controller()->GetState());
+  // The delegate used by the bubble for communicating with the controller.
+  base::WeakPtr<PasswordsModelDelegate> proxy_delegate =
+      controller()->GetModelDelegateProxy();
+
+  // Open the bubble again.
+  local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
+  EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
+  controller()->OnAutoSignin(std::move(local_credentials),
+                             test_local_form().origin);
+  EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, controller()->GetState());
+  // Check the delegate is destroyed. Thus, the first bubble has no way to mess
+  // up with the controller's state.
+  EXPECT_FALSE(proxy_delegate);
+}