Don't close the password bubble on implicit navigations.

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 2aed0db90778c47ea7ec592c8f2069e0a2a91ae6..11e5ee34a8de2526c023d9d4b1f5adf027f977d6 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -385,32 +385,34 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordBlacklisted) {
   ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
 }
 
-TEST_F(ManagePasswordsUIControllerTest, RedirectNavigations) {
+TEST_F(ManagePasswordsUIControllerTest, NormalNavigations) {
   scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
       CreateFormManager());
   controller()->OnPasswordSubmitted(std::move(test_form_manager));
   ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
 
-  // Fake-redirect. We expect the bubble's state to persist so a user reasonably
+  // Fake-navigate. We expect the bubble's state to persist so a user reasonably
   // have been able to interact with the bubble. This happens on

[vabr (Chromium), 2016/02/17 14:28:42]

nit: have -> has

[vasilii, 2016/02/17 14:40:38]

Done.

   // `accounts.google.com`, for instance.
-  content::FrameNavigateParams params;
-  params.transition = ui::PAGE_TRANSITION_SERVER_REDIRECT;
-  controller()->DidNavigateMainFrame(content::LoadCommittedDetails(), params);
-
+  controller()->DidNavigateMainFrame(content::LoadCommittedDetails(),
+                                     content::FrameNavigateParams());
+  EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
+            controller()->GetState());
   ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
 }
 
-TEST_F(ManagePasswordsUIControllerTest, NormalNavigations) {
+TEST_F(ManagePasswordsUIControllerTest, NormalNavigationsClosedBubble) {
   scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
       CreateFormManager());
   controller()->OnPasswordSubmitted(std::move(test_form_manager));
-  ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
+  controller()->SavePassword();
+  controller()->OnBubbleHidden();
+  ExpectIconStateIs(password_manager::ui::MANAGE_STATE);
 
-  // Fake-navigate. We expect the bubble's state to be reset.
+  // Fake-navigate. There is no bubble, reset the state.
   controller()->DidNavigateMainFrame(content::LoadCommittedDetails(),
                                      content::FrameNavigateParams());
-
+  EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
   ExpectIconStateIs(password_manager::ui::INACTIVE_STATE);
 }
 
@@ -653,6 +655,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutoSigninFirstRunAfterNavigation) {
   EXPECT_CALL(dialog_prompt(), ShowAutoSigninPrompt());
   controller()->OnPromptEnableAutoSignin();
 
+  // The dialog should survive any navigation.
   EXPECT_CALL(dialog_prompt(), ControllerGone()).Times(0);
   content::FrameNavigateParams params;
   params.transition = ui::PAGE_TRANSITION_LINK;
@@ -710,16 +713,3 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordUpdated) {
   controller()->UpdatePassword(autofill::PasswordForm());
   ExpectIconStateIs(password_manager::ui::MANAGE_STATE);
 }
-
-TEST_F(ManagePasswordsUIControllerTest, NavigationWhenUpdateBubbleActive) {
-  scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
-      CreateFormManager());
-  controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager));
-  EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
-            controller()->GetState());
-  controller()->DidNavigateMainFrame(content::LoadCommittedDetails(),
-                                     content::FrameNavigateParams());
-  EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
-  // The following line shouldn't crash browser.
-  controller()->OnNoInteractionOnUpdate();
-}