Commit e3f3d26c authored by Vadym Doroshenko's avatar Vadym Doroshenko Committed by Commit Bot

Use NewPasswordFormManager in manage_passwords_ui_controller_test.cc.

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: I0db3bf7bffb8d0bf31bd2f2357b18a7466552f9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1774287Reviewed-by: default avatarVasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691605}
parent 0e4ece8a
...@@ -168,7 +168,9 @@ NewPasswordFormManager::NewPasswordFormManager( ...@@ -168,7 +168,9 @@ NewPasswordFormManager::NewPasswordFormManager(
form_fetcher_->AddConsumer(this); form_fetcher_->AddConsumer(this);
} }
NewPasswordFormManager::~NewPasswordFormManager() = default; NewPasswordFormManager::~NewPasswordFormManager() {
form_fetcher_->RemoveConsumer(this);
}
bool NewPasswordFormManager::DoesManage( bool NewPasswordFormManager::DoesManage(
const FormData& form, const FormData& form,
......
...@@ -340,6 +340,9 @@ class NewPasswordFormManagerTest : public testing::Test { ...@@ -340,6 +340,9 @@ class NewPasswordFormManagerTest : public testing::Test {
StartUploadRequest(_, _, _, _, _, _)) StartUploadRequest(_, _, _, _, _, _))
.WillByDefault(testing::Return(true)); .WillByDefault(testing::Return(true));
fetcher_.reset(new FakeFormFetcher());
fetcher_->Fetch();
CreateFormManager(observed_form_); CreateFormManager(observed_form_);
} }
...@@ -365,8 +368,6 @@ class NewPasswordFormManagerTest : public testing::Test { ...@@ -365,8 +368,6 @@ class NewPasswordFormManagerTest : public testing::Test {
// Creates NewPasswordFormManager and sets it to |form_manager_|. Along the // Creates NewPasswordFormManager and sets it to |form_manager_|. Along the
// way a new |fetcher_| is created. // way a new |fetcher_| is created.
void CreateFormManager(const FormData& observed_form) { void CreateFormManager(const FormData& observed_form) {
fetcher_.reset(new FakeFormFetcher());
fetcher_->Fetch();
form_manager_.reset(new NewPasswordFormManager( form_manager_.reset(new NewPasswordFormManager(
&client_, driver_.AsWeakPtr(), observed_form, fetcher_.get(), &client_, driver_.AsWeakPtr(), observed_form, fetcher_.get(),
std::make_unique<NiceMock<MockFormSaver>>(), nullptr)); std::make_unique<NiceMock<MockFormSaver>>(), nullptr));
...@@ -376,8 +377,6 @@ class NewPasswordFormManagerTest : public testing::Test { ...@@ -376,8 +377,6 @@ class NewPasswordFormManagerTest : public testing::Test {
// |base_auth_observed_form|. Along the way a new |fetcher_| is created. // |base_auth_observed_form|. Along the way a new |fetcher_| is created.
void CreateFormManagerForNonWebForm( void CreateFormManagerForNonWebForm(
const PasswordForm& base_auth_observed_form) { const PasswordForm& base_auth_observed_form) {
fetcher_.reset(new FakeFormFetcher());
fetcher_->Fetch();
form_manager_.reset(new NewPasswordFormManager( form_manager_.reset(new NewPasswordFormManager(
&client_, PasswordStore::FormDigest(base_auth_observed_form), &client_, PasswordStore::FormDigest(base_auth_observed_form),
fetcher_.get(), std::make_unique<NiceMock<MockFormSaver>>())); fetcher_.get(), std::make_unique<NiceMock<MockFormSaver>>()));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment