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

chrome/browser/password_manager/password_manager_test_base.cc

 // Copyright 2015 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 "chrome/browser/password_manager/password_manager_test_base.h"
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 39 matching lines @@
   } else if (!render_frame_host->GetParent()) {
     message_loop_runner_->Quit();
   }
 }
 
 void NavigationObserver::Wait() {
   message_loop_runner_->Run();
 }
 
 BubbleObserver::BubbleObserver(content::WebContents* web_contents)
-    : passwords_model_delegate_(
-          PasswordsModelDelegateFromWebContents(web_contents)) {}
+    : passwords_ui_controller_(
+          ManagePasswordsUIController::FromWebContents(web_contents)) {}
 
 bool BubbleObserver::IsShowingSavePrompt() const {
-  return passwords_model_delegate_->GetState() ==
+  return passwords_ui_controller_->GetState() ==
       password_manager::ui::PENDING_PASSWORD_STATE;
 }
 
 bool BubbleObserver::IsShowingUpdatePrompt() const {
-  return passwords_model_delegate_->GetState() ==
+  return passwords_ui_controller_->GetState() ==
       password_manager::ui::PENDING_PASSWORD_UPDATE_STATE;
 }
 
 void BubbleObserver::Dismiss() const  {
-  passwords_model_delegate_->OnBubbleHidden();
+  passwords_ui_controller_->OnBubbleHidden();
   // Navigate away to reset the state to inactive.
-  static_cast<content::WebContentsObserver*>(
-      static_cast<ManagePasswordsUIController*>(passwords_model_delegate_))
-                ->DidNavigateMainFrame(content::LoadCommittedDetails(),
-                                       content::FrameNavigateParams());
+  static_cast<content::WebContentsObserver*>(passwords_ui_controller_)
+      ->DidNavigateMainFrame(content::LoadCommittedDetails(),
+                             content::FrameNavigateParams());
   ASSERT_EQ(password_manager::ui::INACTIVE_STATE,
-            passwords_model_delegate_->GetState());
+            passwords_ui_controller_->GetState());
 }
 
 void BubbleObserver::AcceptSavePrompt() const {
   ASSERT_TRUE(IsShowingSavePrompt());
-  passwords_model_delegate_->SavePassword();
+  passwords_ui_controller_->SavePassword();
   EXPECT_FALSE(IsShowingSavePrompt());
 }
 
 void BubbleObserver::AcceptUpdatePrompt(
     const autofill::PasswordForm& form) const {
   ASSERT_TRUE(IsShowingUpdatePrompt());
-  passwords_model_delegate_->UpdatePassword(form);
+  passwords_ui_controller_->UpdatePassword(form);
   EXPECT_FALSE(IsShowingUpdatePrompt());
 }
 
 PasswordManagerBrowserTestBase::PasswordManagerBrowserTestBase() {
 }
 PasswordManagerBrowserTestBase::~PasswordManagerBrowserTestBase() {
 }
 
 void PasswordManagerBrowserTestBase::SetUpOnMainThread() {
   // Use TestPasswordStore to remove a possible race. Normally the
@@ skipping 146 matching lines @@
       "  var element = document.getElementById('%s');"
       "window.domAutomationController.send(element && element.value == '%s');",
       iframe_id.c_str(), iframe_id.c_str(), element_id.c_str(),
       element_id.c_str(), expected_value.c_str());
   bool return_value = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       RenderViewHost(), value_check_script, &return_value));
   EXPECT_TRUE(return_value) << "element_id = " << element_id
                             << ", expected_value = " << expected_value;
 }