Make FormFetcher a PasswordStoreConsumer

chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index 39d2fbaf4a1337e65a5d06c6c250d7a3eb362803..7d43dffa7137008ce1500aec232eb0cad8dab505 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -23,6 +23,7 @@
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/common/password_form.h"
+#include "components/password_manager/core/browser/fake_form_fetcher.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager.h"
@@ -160,10 +161,13 @@ void CreateSmartBubbleFieldTrial() {
 class ManagePasswordsUIControllerTest : public ChromeRenderViewHostTestHarness {
  public:
   ManagePasswordsUIControllerTest()
-      : password_manager_(&client_), field_trial_list_(nullptr) {}
+      : password_manager_(&client_), field_trial_list_(nullptr) {
+    fetcher_.Fetch();
+  }
 
   void SetUp() override;
 
+  password_manager::FakeFormFetcher& fetcher() { return fetcher_; }
   autofill::PasswordForm& test_local_form() { return test_local_form_; }
   autofill::PasswordForm& test_federated_form() { return test_federated_form_; }
   DialogPromptMock& dialog_prompt() { return dialog_prompt_; }
@@ -179,7 +183,7 @@ class ManagePasswordsUIControllerTest : public ChromeRenderViewHostTestHarness {
   std::unique_ptr<password_manager::PasswordFormManager>
   CreateFormManagerWithBestMatches(
       const autofill::PasswordForm& observed_form,
-      std::vector<std::unique_ptr<autofill::PasswordForm>> best_matches);
+      const std::vector<const autofill::PasswordForm*>& best_matches);
 
   std::unique_ptr<password_manager::PasswordFormManager> CreateFormManager();
 
@@ -193,6 +197,7 @@ class ManagePasswordsUIControllerTest : public ChromeRenderViewHostTestHarness {
   password_manager::StubPasswordManagerClient client_;
   password_manager::StubPasswordManagerDriver driver_;
   password_manager::PasswordManager password_manager_;
+  password_manager::FakeFormFetcher fetcher_;
 
   autofill::PasswordForm test_local_form_;
   autofill::PasswordForm test_federated_form_;
@@ -239,22 +244,19 @@ void ManagePasswordsUIControllerTest::ExpectIconAndControllerStateIs(
 std::unique_ptr<password_manager::PasswordFormManager>
 ManagePasswordsUIControllerTest::CreateFormManagerWithBestMatches(
     const autofill::PasswordForm& observed_form,
-    std::vector<std::unique_ptr<autofill::PasswordForm>> best_matches) {
+    const std::vector<const autofill::PasswordForm*>& best_matches) {
   std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
       new password_manager::PasswordFormManager(
           &password_manager_, &client_, driver_.AsWeakPtr(), observed_form,
-          base::WrapUnique(new password_manager::StubFormSaver)));
-  test_form_manager->OnGetPasswordStoreResults(std::move(best_matches));
+          base::WrapUnique(new password_manager::StubFormSaver), &fetcher_));
+  fetcher_.SetNonFederated(best_matches, 0u);
   return test_form_manager;
 }
 
 std::unique_ptr<password_manager::PasswordFormManager>
 ManagePasswordsUIControllerTest::CreateFormManager() {
-  std::vector<std::unique_ptr<autofill::PasswordForm>> stored_forms;
-  stored_forms.push_back(
-      base::MakeUnique<autofill::PasswordForm>(test_local_form()));
   return CreateFormManagerWithBestMatches(test_local_form(),
-                                          std::move(stored_forms));
+                                          {&test_local_form()});
 }
 
 void ManagePasswordsUIControllerTest::TestNotChangingStateOnAutofill(
@@ -336,11 +338,8 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedFormPasswordSubmitted) {
   blacklisted.origin = test_local_form().origin;
   blacklisted.signon_realm = blacklisted.origin.spec();
   blacklisted.blacklisted_by_user = true;
-  std::vector<std::unique_ptr<autofill::PasswordForm>> stored_forms;
-  stored_forms.push_back(base::MakeUnique<autofill::PasswordForm>(blacklisted));
   std::unique_ptr<password_manager::PasswordFormManager> test_form_manager =
-      CreateFormManagerWithBestMatches(test_local_form(),
-                                       std::move(stored_forms));
+      CreateFormManagerWithBestMatches(test_local_form(), {&blacklisted});
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   controller()->OnPasswordSubmitted(std::move(test_form_manager));
   EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
@@ -358,11 +357,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedBubbleSuppressed) {
   stats.origin_domain = test_local_form().origin.GetOrigin();
   stats.username_value = test_local_form().username_value;
   stats.dismissal_count = kGreatDissmisalCount;
-  std::vector<std::unique_ptr<password_manager::InteractionsStats>>
-      interactions;
-  interactions.push_back(
-      base::MakeUnique<password_manager::InteractionsStats>(stats));
-  test_form_manager->OnGetSiteStatistics(std::move(interactions));
+  fetcher().set_stats({&stats});
   test_form_manager->ProvisionallySave(
       test_local_form(),
       password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
@@ -386,11 +381,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedBubbleNotSuppressed) {
   stats.origin_domain = test_local_form().origin.GetOrigin();
   stats.username_value = base::ASCIIToUTF16("not my username");
   stats.dismissal_count = kGreatDissmisalCount;
-  std::vector<std::unique_ptr<password_manager::InteractionsStats>>
-      interactions;
-  interactions.push_back(
-      base::MakeUnique<password_manager::InteractionsStats>(stats));
-  test_form_manager->OnGetSiteStatistics(std::move(interactions));
+  fetcher().set_stats({&stats});
   test_form_manager->ProvisionallySave(
       test_local_form(),
       password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);