Use NewPasswordFormManager in manage_passwords_test.h

This CL replaces PasswordFormManager->NewPasswordFormManager. The main
difference is that a constructor of form managers are different:
PasswordFormManager takes PasswordForm
NewPasswordFormManager takes FormData (which is converted to PasswordForm
inside NewPasswordFormManager during parsing).

Bug: 949519
Change-Id: I44dbd48b8c61d8c72d779eaf4feefed826271582
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1774622Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691622}

chrome/browser/ui/passwords/manage_passwords_test.cc

@@ -20,11 +20,13 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/password_manager/core/browser/password_form_manager.h"
+#include "components/password_manager/core/browser/new_password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/stub_form_saver.h"
 #include "content/public/test/test_utils.h"
 
+using password_manager::NewPasswordFormManager;
+
 namespace {
 constexpr char kTestOrigin[] = "https://www.example.com";
 }  // namespace
@@ -44,11 +46,22 @@ ManagePasswordsTest::ManagePasswordsTest() {
       url::Origin::Create(GURL("https://somelongeroriginurl.com/"));
   federated_form_.username_value =
       base::ASCIIToUTF16("test_federation_username");
-}
 
-ManagePasswordsTest::~ManagePasswordsTest() {
+  // Create a simple sign-in form.
+  observed_form_.url = password_form_.origin;
+  autofill::FormFieldData field;
+  field.form_control_type = "text";
+  observed_form_.fields.push_back(field);
+  field.form_control_type = "password";
+  observed_form_.fields.push_back(field);
+
+  // Turn off waiting for server predictions in order to avoid dealing with
+  // posted tasks in NewPasswordFormManager.
+  NewPasswordFormManager::set_wait_for_server_predictions_for_filling(false);
 }
 
+ManagePasswordsTest::~ManagePasswordsTest() = default;
+
 void ManagePasswordsTest::SetUpOnMainThread() {
   AddTabAtIndex(0, GURL(kTestOrigin), ui::PAGE_TRANSITION_TYPED);
 }
@@ -74,23 +87,21 @@ void ManagePasswordsTest::SetupManagingPasswords() {
 }
 
 void ManagePasswordsTest::SetupPendingPassword() {
-  std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
-      new password_manager::PasswordFormManager(
-          nullptr, &client_, driver_.AsWeakPtr(), *test_form(),
-          base::WrapUnique(new password_manager::StubFormSaver), &fetcher_));
-  test_form_manager->Init(nullptr);
+  auto form_manager = std::make_unique<NewPasswordFormManager>(
+      &client_, driver_.AsWeakPtr(), observed_form_, &fetcher_,
+      base::WrapUnique(new password_manager::StubFormSaver),
+      nullptr /*  metrics_recorder */);
   fetcher_.NotifyFetchCompleted();
-  GetController()->OnPasswordSubmitted(std::move(test_form_manager));
+  GetController()->OnPasswordSubmitted(std::move(form_manager));
 }
 
 void ManagePasswordsTest::SetupAutomaticPassword() {
-  std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
-      new password_manager::PasswordFormManager(
-          nullptr, &client_, driver_.AsWeakPtr(), *test_form(),
-          base::WrapUnique(new password_manager::StubFormSaver), &fetcher_));
-  test_form_manager->Init(nullptr);
+  auto form_manager = std::make_unique<NewPasswordFormManager>(
+      &client_, driver_.AsWeakPtr(), observed_form_, &fetcher_,
+      base::WrapUnique(new password_manager::StubFormSaver),
+      nullptr /*  metrics_recorder */);
   fetcher_.NotifyFetchCompleted();
-  GetController()->OnAutomaticPasswordSave(std::move(test_form_manager));
+  GetController()->OnAutomaticPasswordSave(std::move(form_manager));
 }
 
 void ManagePasswordsTest::SetupAutoSignin(

chrome/browser/ui/passwords/manage_passwords_test.h

@@ -12,6 +12,7 @@
 #include "base/metrics/histogram_samples.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "components/autofill/core/common/form_data.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/stub_password_manager_client.h"
@@ -61,6 +62,7 @@ class ManagePasswordsTest : public InProcessBrowserTest {
  private:
   autofill::PasswordForm password_form_;
   autofill::PasswordForm federated_form_;
+  autofill::FormData observed_form_;
   base::HistogramTester histogram_tester_;
   password_manager::StubPasswordManagerClient client_;
   password_manager::StubPasswordManagerDriver driver_;