Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
index e54e029a4ec3a045ddbe969a1713eb18858fc369..8b9df1d1d031dd77db649eda5d58379410fe90e7 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
+#include "components/password_manager/core/browser/stub_password_manager_client.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "content/public/browser/navigation_details.h"
 
@@ -38,12 +39,15 @@ class ManagePasswordsUIControllerMock
   }
 
   // We don't have a FormManager in tests, so stub these out.
-  void SavePasswordInternal() override;
+  void SavePassword() override;
   bool saved_password() const { return saved_password_; }
 
-  void NeverSavePasswordInternal() override;
+  void NeverSavePassword() override;
   bool never_saved_password() const { return never_saved_password_; }
 
+  void UnblacklistSite() override;
+  bool unblacklist_site() const { return unblacklist_site_; }
+
   void ChooseCredential(const autofill::PasswordForm& form,
                         password_manager::CredentialType form_type) override;
   bool choose_credential() const { return choose_credential_; }
@@ -56,31 +60,28 @@ class ManagePasswordsUIControllerMock
 
   void UpdateAndroidAccountChooserInfoBarVisibility() override;
 
-  base::TimeDelta Elapsed() const override;
-
-  // Sneaky setters for testing.
-  void SetPasswordFormMap(const autofill::ConstPasswordFormMap& map) {
-    password_form_map_ = map;
-  }
-  using ManagePasswordsUIController::SetState;
-
-  void SetElapsed(base::TimeDelta elapsed) { elapsed_ = elapsed; }
-
-  // True if this controller is installed on |web_contents()|.
-  bool IsInstalled() const;
+  // Simulated the pending password state. |best_matches| can't be empty.

[vabr (Chromium), 2015/03/17 09:25:58]

I'm confused about the past tense (simulated). Is it a typo (from simulate), or
does this mean that this should be called after the pending state was somehow
simulated? The latter case would need more explanation.

[vasilii, 2015/03/17 10:49:48]

It's a typo of course.

+  void PretendSubmittedPassword(
+    ScopedVector<autofill::PasswordForm> best_matches);
 
-  using ManagePasswordsUIController::DidNavigateMainFrame;
+  static scoped_ptr<password_manager::PasswordFormManager> CreateFormManager(
+      password_manager::PasswordManagerClient* client,
+      const autofill::PasswordForm& observed_form,
+      ScopedVector<autofill::PasswordForm> best_matches);
 
  private:
   bool navigated_to_settings_page_;
   bool saved_password_;
   bool never_saved_password_;
+  bool unblacklist_site_;
   bool choose_credential_;
   base::TimeDelta elapsed_;
 
   autofill::PasswordForm chosen_credential_;
   autofill::PasswordForm pending_password_;
 
+  password_manager::StubPasswordManagerClient client_;
+
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsUIControllerMock);
 };