Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h

 // Copyright 2014 The Chromium Authors. All rights reserved.

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

Have you though about merging this class into
chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc, now that
it is only used there?
I actually support leaving it separately, because it is fairly big; but I just
wanted to check if you have considered it and what did you think about it.

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

It's widely used by the Mac code.

[vabr (Chromium), 2015/03/17 11:55:13]

Ah right, I always forget about the stuff not cross-referenced in CodeSearch.
Never mind, then.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_MOCK_H_
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_MOCK_H_
 
 #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"
 
 namespace content {
 class WebContents;
 }  // namespace content
 
 namespace password_manager {
 enum class CredentialType : unsigned int;
 }
@@ skipping 11 matching lines @@
   // Navigation, surprisingly, is platform-specific; Android's settings page
   // is native UI and therefore isn't available in a tab for unit tests.
   //
   // TODO(mkwst): Determine how to reasonably test this on that platform.
   void NavigateToPasswordManagerSettingsPage() override;
   bool navigated_to_settings_page() const {
     return navigated_to_settings_page_;
   }
 
   // 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_; }
   autofill::PasswordForm chosen_credential() { return chosen_credential_; }
 
   const autofill::PasswordForm& PendingPassword() const override;
   void SetPendingPassword(autofill::PasswordForm pending_password);
 
   void UpdateBubbleAndIconVisibility() override;
 
   void UpdateAndroidAccountChooserInfoBarVisibility() override;
 
-  base::TimeDelta Elapsed() const override;
+  // 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);
 
-  // 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;
-
-  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);
 };
 
 #endif  // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_MOCK_H_