Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
index 87df775d45433cad2bef9224e6e28234f457da09..d84b5254c65eaaa5b889b0bf4e645087b1b8b564 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h"
 
 #include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/browser/password_form_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -14,6 +15,7 @@ ManagePasswordsUIControllerMock::ManagePasswordsUIControllerMock(
       navigated_to_settings_page_(false),
       saved_password_(false),
       never_saved_password_(false),
+      unblacklist_site_(false),
       choose_credential_(false) {
   // Do not silently replace an existing ManagePasswordsUIController because it
   // unregisters itself in WebContentsDestroyed().
@@ -40,7 +42,6 @@ void ManagePasswordsUIControllerMock::SetPendingPassword(
 }
 
 void ManagePasswordsUIControllerMock::UpdateBubbleAndIconVisibility() {
-  ManagePasswordsUIController::UpdateBubbleAndIconVisibility();
   OnBubbleShown();
 }
 
@@ -49,27 +50,47 @@ void ManagePasswordsUIControllerMock::
   OnBubbleShown();
 }
 
-base::TimeDelta ManagePasswordsUIControllerMock::Elapsed() const {
-  return elapsed_;
-}
-
-bool ManagePasswordsUIControllerMock::IsInstalled() const {
-  return web_contents()->GetUserData(UserDataKey()) == this;
-}
-
-void ManagePasswordsUIControllerMock::SavePasswordInternal() {
+void ManagePasswordsUIControllerMock::SavePassword() {
   saved_password_ = true;
 }
 
-void ManagePasswordsUIControllerMock::NeverSavePasswordInternal() {
+void ManagePasswordsUIControllerMock::NeverSavePassword() {
   never_saved_password_ = true;
 }
 
+void ManagePasswordsUIControllerMock::UnblacklistSite() {
+  unblacklist_site_ = true;
+}
+
 void ManagePasswordsUIControllerMock::ChooseCredential(
     const autofill::PasswordForm& form,
     password_manager::CredentialType form_type) {
-  SetState(password_manager::ui::INACTIVE_STATE);
   EXPECT_FALSE(choose_credential_);
   choose_credential_ = true;
   chosen_credential_ = form;
 }
+
+void ManagePasswordsUIControllerMock::PretendSubmittedPassword(
+    ScopedVector<autofill::PasswordForm> best_matches) {
+  ASSERT_FALSE(best_matches.empty());
+  autofill::PasswordForm observed_form = *best_matches[0];
+  scoped_ptr<password_manager::PasswordFormManager> form_manager =
+      CreateFormManager(&client_, observed_form, best_matches.Pass());
+  OnPasswordSubmitted(form_manager.Pass());
+}
+
+// static
+scoped_ptr<password_manager::PasswordFormManager>
+ManagePasswordsUIControllerMock::CreateFormManager(
+      password_manager::PasswordManagerClient* client,
+      const autofill::PasswordForm& observed_form,
+      ScopedVector<autofill::PasswordForm> best_matches) {
+  scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+      new password_manager::PasswordFormManager(
+          nullptr, client,
+          base::WeakPtr<password_manager::PasswordManagerDriver>(),
+          observed_form, true));
+  test_form_manager->SimulateFetchMatchingLoginsFromPasswordStore();
+  test_form_manager->OnGetPasswordStoreResults(best_matches.Pass());
+  return test_form_manager.Pass();
+}