Don't close the password bubble on implicit navigations.

chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

 // Copyright 2014 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 <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 367 matching lines @@
       CreateFormManager());
   test_form_manager->ProvisionallySave(
       test_local_form(),
       password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
   controller()->OnPasswordSubmitted(std::move(test_form_manager));
 
   controller()->NeverSavePassword();
   ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
 }
 
-TEST_F(ManagePasswordsUIControllerTest, RedirectNavigations) {
-  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
-  // have been able to interact with the bubble. This happens on
-  // `accounts.google.com`, for instance.
-  content::FrameNavigateParams params;
-  params.transition = ui::PAGE_TRANSITION_SERVER_REDIRECT;
-  controller()->DidNavigateMainFrame(content::LoadCommittedDetails(), params);
-
-  ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
-}
-
 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-navigate. We expect the bubble's state to be reset.
+  // 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.
   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, NormalNavigationsClosedBubble) {
+  scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+      CreateFormManager());
+  controller()->OnPasswordSubmitted(std::move(test_form_manager));
+  controller()->SavePassword();
+  controller()->OnBubbleHidden();
+  ExpectIconStateIs(password_manager::ui::MANAGE_STATE);
+
+  // 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);
 }
 
 TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedToNonWebbyURL) {
   // Navigate to a non-webby URL, then see what happens!
   content::WebContentsTester::For(web_contents())
       ->NavigateAndCommit(GURL("chrome://sign-in"));
 
   scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
       CreateFormManager());
@@ skipping 222 matching lines @@
   EXPECT_CALL(dialog_prompt(), ControllerGone());
 }
 
 TEST_F(ManagePasswordsUIControllerTest, AutoSigninFirstRunAfterNavigation) {
   // Pop up the autosignin promo.
   EXPECT_CALL(*controller(), CreateAutoSigninPrompt(_)).WillOnce(
       Return(&dialog_prompt()));
   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;
   controller()->DidNavigateMainFrame(content::LoadCommittedDetails(), params);
   ASSERT_TRUE(testing::Mock::VerifyAndClearExpectations(&dialog_prompt()));
   EXPECT_CALL(dialog_prompt(), ControllerGone());
 }
 
 TEST_F(ManagePasswordsUIControllerTest, AutofillDuringAutoSignin) {
   ScopedVector<autofill::PasswordForm> local_credentials;
@@ skipping 37 matching lines @@
       CreateFormManager());
   test_form_manager->ProvisionallySave(
       test_local_form(),
       password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
   controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager));
 
   ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE);
   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();
-}