Skip to content

GitLab

T
tangled
Commit 05b00ed4 authored by Jan Wilken Dörrie's avatar Jan Wilken Dörrie Committed by Chromium LUCI CQ
Browse files
Options

[Passwords] Rename PasswordstoreDefault to PasswordStoreImpl 

Following the removal of PasswordStoreX, PasswordstoreDefault is the only
remaining production implementation of the PasswordStore interface. To
avoid confusion and to be consistent with existing Chromium practice,
this change renames PasswordstoreDefault to PasswordStoreImpl.

Bug: 950269
Change-Id: I0ce1c73407b587ace9fdc2d2dfed1a53765a2433
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584167
Commit-Queue: Eugene But <eugenebut@chromium.org>
Auto-Submit: Jan Wilken Dörrie <jdoerrie@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Reviewed-by: default avatarMohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835747}
parent a57c0aab
Show whitespace changes
Inline Side-by-side
Showing with 138 additions and 142 deletions
chrome/browser/password_manager/account_password_store_factory.cc
View file @ 05b00ed4
......@@ -24,8 +24,8 @@
#include "components/password_manager/core/browser/password_manager_constants.h"
#include "components/password_manager/core/browser/password_manager_util.h"
#include "components/password_manager/core/browser/password_store.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_factory_util.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
......@@ -187,7 +187,7 @@ AccountPasswordStoreFactory::BuildServiceInstanceFor(
profile->GetPath()));
scoped_refptr<PasswordStore> ps =
new password_manager::PasswordStoreDefault(std::move(login_db));
new password_manager::PasswordStoreImpl(std::move(login_db));
if (!ps->Init(profile->GetPrefs(),
base::BindRepeating(&SyncEnabledOrDisabled, profile))) {
// TODO(crbug.com/479725): Remove the LOG once this error is visible in the
......
chrome/browser/password_manager/password_store_factory.cc
View file @ 05b00ed4
......@@ -24,8 +24,8 @@
#include "components/password_manager/core/browser/password_manager_constants.h"
#include "components/password_manager/core/browser/password_manager_util.h"
#include "components/password_manager/core/browser/password_store.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_factory_util.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "components/password_manager/core/browser/password_store_signin_notifier_impl.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
......@@ -132,7 +132,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
scoped_refptr<PasswordStore> ps;
#if defined(OS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_ANDROID) || \
defined(OS_MAC) || defined(USE_X11) || defined(USE_OZONE)
ps = new password_manager::PasswordStoreDefault(std::move(login_db));
ps = new password_manager::PasswordStoreImpl(std::move(login_db));
#else
NOTIMPLEMENTED();
#endif
......
components/password_manager/core/browser/BUILD.gn
View file @ 05b00ed4
......@@ -182,10 +182,10 @@ static_library("browser") {
"password_store_change.h",
"password_store_consumer.cc",
"password_store_consumer.h",
"password_store_default.cc",
"password_store_default.h",
"password_store_factory_util.cc",
"password_store_factory_util.h",
"password_store_impl.cc",
"password_store_impl.h",
"password_store_signin_notifier.h",
"password_store_sync.cc",
"password_store_sync.h",
......@@ -648,7 +648,7 @@ source_set("unit_tests") {
"password_reuse_detection_manager_unittest.cc",
"password_reuse_detector_unittest.cc",
"password_save_manager_impl_unittest.cc",
"password_store_default_unittest.cc",
"password_store_impl_unittest.cc",
"password_store_origin_unittest.h",
"password_store_unittest.cc",
"password_sync_util_unittest.cc",
......@@ -679,7 +679,7 @@ source_set("unit_tests") {
sources += [ "password_scripts_fetcher_impl_unittests.cc" ]
}
if (is_mac) {
sources -= [ "password_store_default_unittest.cc" ]
sources -= [ "password_store_impl_unittest.cc" ]
}
if (is_ios) {
sources += [ "login_database_ios_unittest.cc" ]
......
components/password_manager/core/browser/password_store_default.cc → components/password_manager/core/browser/password_store_impl.cc
View file @ 05b00ed4
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include <iterator>
#include <set>
......@@ -16,18 +16,17 @@
namespace password_manager {
PasswordStoreDefault::PasswordStoreDefault(
std::unique_ptr<LoginDatabase> login_db)
PasswordStoreImpl::PasswordStoreImpl(std::unique_ptr<LoginDatabase> login_db)
: login_db_(std::move(login_db)) {}
PasswordStoreDefault::~PasswordStoreDefault() = default;
PasswordStoreImpl::~PasswordStoreImpl() = default;
void PasswordStoreDefault::ShutdownOnUIThread() {
void PasswordStoreImpl::ShutdownOnUIThread() {
PasswordStore::ShutdownOnUIThread();
ScheduleTask(base::BindOnce(&PasswordStoreDefault::ResetLoginDB, this));
ScheduleTask(base::BindOnce(&PasswordStoreImpl::ResetLoginDB, this));
}
bool PasswordStoreDefault::InitOnBackgroundSequence() {
bool PasswordStoreImpl::InitOnBackgroundSequence() {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
DCHECK(login_db_);
bool success = true;
......@@ -39,15 +38,13 @@ bool PasswordStoreDefault::InitOnBackgroundSequence() {
LOG(ERROR) << "Could not create/open login database.";
}
if (success) {
login_db_->SetDeletionsHaveSyncedCallback(
base::BindRepeating(&PasswordStoreDefault::NotifyDeletionsHaveSynced,
base::Unretained(this)));
login_db_->SetDeletionsHaveSyncedCallback(base::BindRepeating(
&PasswordStoreImpl::NotifyDeletionsHaveSynced, base::Unretained(this)));
}
return PasswordStore::InitOnBackgroundSequence() && success;
}
void PasswordStoreDefault::ReportMetricsImpl(
const std::string& sync_username,
void PasswordStoreImpl::ReportMetricsImpl(const std::string& sync_username,
bool custom_passphrase_sync_enabled,
BulkCheckDone bulk_check_done) {
if (!login_db_)
......@@ -57,7 +54,7 @@ void PasswordStoreDefault::ReportMetricsImpl(
bulk_check_done);
}
PasswordStoreChangeList PasswordStoreDefault::AddLoginImpl(
PasswordStoreChangeList PasswordStoreImpl::AddLoginImpl(
const PasswordForm& form,
AddLoginError* error) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
......@@ -70,7 +67,7 @@ PasswordStoreChangeList PasswordStoreDefault::AddLoginImpl(
return login_db_->AddLogin(form, error);
}
PasswordStoreChangeList PasswordStoreDefault::UpdateLoginImpl(
PasswordStoreChangeList PasswordStoreImpl::UpdateLoginImpl(
const PasswordForm& form,
UpdateLoginError* error) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
......@@ -83,7 +80,7 @@ PasswordStoreChangeList PasswordStoreDefault::UpdateLoginImpl(
return login_db_->UpdateLogin(form, error);
}
PasswordStoreChangeList PasswordStoreDefault::RemoveLoginImpl(
PasswordStoreChangeList PasswordStoreImpl::RemoveLoginImpl(
const PasswordForm& form) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
PasswordStoreChangeList changes;
......@@ -93,7 +90,7 @@ PasswordStoreChangeList PasswordStoreDefault::RemoveLoginImpl(
return PasswordStoreChangeList();
}
PasswordStoreChangeList PasswordStoreDefault::RemoveLoginsByURLAndTimeImpl(
PasswordStoreChangeList PasswordStoreImpl::RemoveLoginsByURLAndTimeImpl(
const base::RepeatingCallback<bool(const GURL&)>& url_filter,
base::Time delete_begin,
base::Time delete_end) {
......@@ -114,7 +111,7 @@ PasswordStoreChangeList PasswordStoreDefault::RemoveLoginsByURLAndTimeImpl(
return changes;
}
PasswordStoreChangeList PasswordStoreDefault::RemoveLoginsCreatedBetweenImpl(
PasswordStoreChangeList PasswordStoreImpl::RemoveLoginsCreatedBetweenImpl(
base::Time delete_begin,
base::Time delete_end) {
PasswordStoreChangeList changes;
......@@ -125,7 +122,7 @@ PasswordStoreChangeList PasswordStoreDefault::RemoveLoginsCreatedBetweenImpl(
return changes;
}
PasswordStoreChangeList PasswordStoreDefault::DisableAutoSignInForOriginsImpl(
PasswordStoreChangeList PasswordStoreImpl::DisableAutoSignInForOriginsImpl(
const base::RepeatingCallback<bool(const GURL&)>& origin_filter) {
PrimaryKeyToFormMap key_to_form_map;
PasswordStoreChangeList changes;
......@@ -154,7 +151,7 @@ PasswordStoreChangeList PasswordStoreDefault::DisableAutoSignInForOriginsImpl(
return changes;
}
bool PasswordStoreDefault::RemoveStatisticsByOriginAndTimeImpl(
bool PasswordStoreImpl::RemoveStatisticsByOriginAndTimeImpl(
const base::RepeatingCallback<bool(const GURL&)>& origin_filter,
base::Time delete_begin,
base::Time delete_end) {
......@@ -163,7 +160,7 @@ bool PasswordStoreDefault::RemoveStatisticsByOriginAndTimeImpl(
}
std::vector<std::unique_ptr<PasswordForm>>
PasswordStoreDefault::FillMatchingLogins(const FormDigest& form) {
PasswordStoreImpl::FillMatchingLogins(const FormDigest& form) {
std::vector<std::unique_ptr<PasswordForm>> matched_forms;
if (login_db_ && !login_db_->GetLogins(form, &matched_forms))
return std::vector<std::unique_ptr<PasswordForm>>();
......@@ -171,7 +168,7 @@ PasswordStoreDefault::FillMatchingLogins(const FormDigest& form) {
}
std::vector<std::unique_ptr<PasswordForm>>
PasswordStoreDefault::FillMatchingLoginsByPassword(
PasswordStoreImpl::FillMatchingLoginsByPassword(
const base::string16& plain_text_password) {
std::vector<std::unique_ptr<PasswordForm>> matched_forms;
if (login_db_ &&
......@@ -180,58 +177,58 @@ PasswordStoreDefault::FillMatchingLoginsByPassword(
return matched_forms;
}
bool PasswordStoreDefault::FillAutofillableLogins(
bool PasswordStoreImpl::FillAutofillableLogins(
std::vector<std::unique_ptr<PasswordForm>>* forms) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
return login_db_ && login_db_->GetAutofillableLogins(forms);
}
bool PasswordStoreDefault::FillBlocklistLogins(
bool PasswordStoreImpl::FillBlocklistLogins(
std::vector<std::unique_ptr<PasswordForm>>* forms) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
return login_db_ && login_db_->GetBlocklistLogins(forms);
}
DatabaseCleanupResult PasswordStoreDefault::DeleteUndecryptableLogins() {
DatabaseCleanupResult PasswordStoreImpl::DeleteUndecryptableLogins() {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
if (!login_db_)
return DatabaseCleanupResult::kDatabaseUnavailable;
return login_db_->DeleteUndecryptableLogins();
}
void PasswordStoreDefault::AddSiteStatsImpl(const InteractionsStats& stats) {
void PasswordStoreImpl::AddSiteStatsImpl(const InteractionsStats& stats) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
if (login_db_)
login_db_->stats_table().AddRow(stats);
}
void PasswordStoreDefault::RemoveSiteStatsImpl(const GURL& origin_domain) {
void PasswordStoreImpl::RemoveSiteStatsImpl(const GURL& origin_domain) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
if (login_db_)
login_db_->stats_table().RemoveRow(origin_domain);
}
std::vector<InteractionsStats> PasswordStoreDefault::GetAllSiteStatsImpl() {
std::vector<InteractionsStats> PasswordStoreImpl::GetAllSiteStatsImpl() {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
return login_db_ ? login_db_->stats_table().GetAllRows()
: std::vector<InteractionsStats>();
}
std::vector<InteractionsStats> PasswordStoreDefault::GetSiteStatsImpl(
std::vector<InteractionsStats> PasswordStoreImpl::GetSiteStatsImpl(
const GURL& origin_domain) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
return login_db_ ? login_db_->stats_table().GetRows(origin_domain)
: std::vector<InteractionsStats>();
}
bool PasswordStoreDefault::AddCompromisedCredentialsImpl(
bool PasswordStoreImpl::AddCompromisedCredentialsImpl(
const CompromisedCredentials& credentials) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
return login_db_ &&
login_db_->insecure_credentials_table().AddRow(credentials);
}
bool PasswordStoreDefault::RemoveCompromisedCredentialsImpl(
bool PasswordStoreImpl::RemoveCompromisedCredentialsImpl(
const std::string& signon_realm,
const base::string16& username,
RemoveCompromisedCredentialsReason reason) {
......@@ -241,7 +238,7 @@ bool PasswordStoreDefault::RemoveCompromisedCredentialsImpl(
}
std::vector<CompromisedCredentials>
PasswordStoreDefault::GetAllCompromisedCredentialsImpl() {
PasswordStoreImpl::GetAllCompromisedCredentialsImpl() {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
std::vector<CompromisedCredentials> compromised_credentials =
login_db_ ? login_db_->insecure_credentials_table().GetAllRows()
......@@ -255,7 +252,7 @@ PasswordStoreDefault::GetAllCompromisedCredentialsImpl() {
}
std::vector<CompromisedCredentials>
PasswordStoreDefault::GetMatchingCompromisedCredentialsImpl(
PasswordStoreImpl::GetMatchingCompromisedCredentialsImpl(
const std::string& signon_realm) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
std::vector<CompromisedCredentials> compromised_credentials =
......@@ -269,7 +266,7 @@ PasswordStoreDefault::GetMatchingCompromisedCredentialsImpl(
return compromised_credentials;
}
bool PasswordStoreDefault::RemoveCompromisedCredentialsByUrlAndTimeImpl(
bool PasswordStoreImpl::RemoveCompromisedCredentialsByUrlAndTimeImpl(
const base::RepeatingCallback<bool(const GURL&)>& url_filter,
base::Time remove_begin,
base::Time remove_end) {
......@@ -279,46 +276,46 @@ bool PasswordStoreDefault::RemoveCompromisedCredentialsByUrlAndTimeImpl(
url_filter, remove_begin, remove_end);
}
void PasswordStoreDefault::AddFieldInfoImpl(const FieldInfo& field_info) {
void PasswordStoreImpl::AddFieldInfoImpl(const FieldInfo& field_info) {
if (login_db_)
login_db_->field_info_table().AddRow(field_info);
}
std::vector<FieldInfo> PasswordStoreDefault::GetAllFieldInfoImpl() {
std::vector<FieldInfo> PasswordStoreImpl::GetAllFieldInfoImpl() {
return login_db_ ? login_db_->field_info_table().GetAllRows()
: std::vector<FieldInfo>();
}
void PasswordStoreDefault::RemoveFieldInfoByTimeImpl(base::Time remove_begin,
void PasswordStoreImpl::RemoveFieldInfoByTimeImpl(base::Time remove_begin,
base::Time remove_end) {
if (login_db_)
login_db_->field_info_table().RemoveRowsByTime(remove_begin, remove_end);
}
bool PasswordStoreDefault::IsEmpty() {
bool PasswordStoreImpl::IsEmpty() {
if (!login_db_)
return true;
return login_db_->IsEmpty();
}
bool PasswordStoreDefault::BeginTransaction() {
bool PasswordStoreImpl::BeginTransaction() {
if (login_db_)
return login_db_->BeginTransaction();
return false;
}
void PasswordStoreDefault::RollbackTransaction() {
void PasswordStoreImpl::RollbackTransaction() {
if (login_db_)
login_db_->RollbackTransaction();
}
bool PasswordStoreDefault::CommitTransaction() {
bool PasswordStoreImpl::CommitTransaction() {
if (login_db_)
return login_db_->CommitTransaction();
return false;
}
FormRetrievalResult PasswordStoreDefault::ReadAllLogins(
FormRetrievalResult PasswordStoreImpl::ReadAllLogins(
PrimaryKeyToFormMap* key_to_form_map) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
if (!login_db_)
......@@ -326,7 +323,7 @@ FormRetrievalResult PasswordStoreDefault::ReadAllLogins(
return login_db_->GetAllLogins(key_to_form_map);
}
PasswordStoreChangeList PasswordStoreDefault::RemoveLoginByPrimaryKeySync(
PasswordStoreChangeList PasswordStoreImpl::RemoveLoginByPrimaryKeySync(
int primary_key) {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
PasswordStoreChangeList changes;
......@@ -336,19 +333,19 @@ PasswordStoreChangeList PasswordStoreDefault::RemoveLoginByPrimaryKeySync(
return PasswordStoreChangeList();
}
PasswordStoreSync::MetadataStore* PasswordStoreDefault::GetMetadataStore() {
PasswordStoreSync::MetadataStore* PasswordStoreImpl::GetMetadataStore() {
return login_db_.get();
}
bool PasswordStoreDefault::IsAccountStore() const {
bool PasswordStoreImpl::IsAccountStore() const {
return login_db_ && login_db_->is_account_store();
}
bool PasswordStoreDefault::DeleteAndRecreateDatabaseFile() {
bool PasswordStoreImpl::DeleteAndRecreateDatabaseFile() {
return login_db_ && login_db_->DeleteAndRecreateDatabaseFile();
}
void PasswordStoreDefault::ResetLoginDB() {
void PasswordStoreImpl::ResetLoginDB() {
DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
login_db_.reset();
}
......
components/password_manager/core/browser/password_store_default.h → components/password_manager/core/browser/password_store_impl.h
View file @ 05b00ed4
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_DEFAULT_H_
#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_DEFAULT_H_
#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_IMPL_H_
#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_IMPL_H_
#include <memory>
#include <string>
......@@ -18,11 +18,11 @@ namespace password_manager {
// Simple password store implementation that delegates everything to
// the LoginDatabase.
class PasswordStoreDefault : public PasswordStore {
class PasswordStoreImpl : public PasswordStore {
public:
// The |login_db| must not have been Init()-ed yet. It will be initialized in
// a deferred manner on the background sequence.
explicit PasswordStoreDefault(std::unique_ptr<LoginDatabase> login_db);
explicit PasswordStoreImpl(std::unique_ptr<LoginDatabase> login_db);
void ShutdownOnUIThread() override;
......@@ -30,7 +30,7 @@ class PasswordStoreDefault : public PasswordStore {
LoginDatabase* login_db() const { return login_db_.get(); }
protected:
~PasswordStoreDefault() override;
~PasswordStoreImpl() override;
// Opens |login_db_| on the background sequence.
bool InitOnBackgroundSequence() override;
......@@ -114,9 +114,9 @@ class PasswordStoreDefault : public PasswordStore {
// fails, |login_db_| will be reset and stay NULL for the lifetime of |this|.
std::unique_ptr<LoginDatabase> login_db_;
DISALLOW_COPY_AND_ASSIGN(PasswordStoreDefault);
DISALLOW_COPY_AND_ASSIGN(PasswordStoreImpl);
};
} // namespace password_manager
#endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_DEFAULT_H_
#endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_IMPL_H_
components/password_manager/core/browser/password_store_default_unittest.cc → components/password_manager/core/browser/password_store_impl_unittest.cc
View file @ 05b00ed4
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include <memory>
#include <utility>
......@@ -75,14 +75,14 @@ PasswordFormData CreateTestPasswordFormData() {
return data;
}
class PasswordStoreDefaultTestDelegate {
class PasswordStoreImplTestDelegate {
public:
PasswordStoreDefaultTestDelegate();
explicit PasswordStoreDefaultTestDelegate(
PasswordStoreImplTestDelegate();
explicit PasswordStoreImplTestDelegate(
std::unique_ptr<LoginDatabase> database);
~PasswordStoreDefaultTestDelegate();
~PasswordStoreImplTestDelegate();
PasswordStoreDefault* store() { return store_.get(); }
PasswordStoreImpl* store() { return store_.get(); }
void FinishAsyncProcessing();
......@@ -91,64 +91,64 @@ class PasswordStoreDefaultTestDelegate {
void ClosePasswordStore();
scoped_refptr<PasswordStoreDefault> CreateInitializedStore(
scoped_refptr<PasswordStoreImpl> CreateInitializedStore(
std::unique_ptr<LoginDatabase> database);
base::FilePath test_login_db_file_path() const;
base::test::TaskEnvironment task_environment_{base::test::TaskEnvironment::MainThreadType::UI};
base::test::TaskEnvironment task_environment_{
base::test::TaskEnvironment::MainThreadType::UI};
base::ScopedTempDir temp_dir_;
TestingPrefServiceSimple prefs_;
scoped_refptr<PasswordStoreDefault> store_;
scoped_refptr<PasswordStoreImpl> store_;
DISALLOW_COPY_AND_ASSIGN(PasswordStoreDefaultTestDelegate);
DISALLOW_COPY_AND_ASSIGN(PasswordStoreImplTestDelegate);
};
PasswordStoreDefaultTestDelegate::PasswordStoreDefaultTestDelegate() {
PasswordStoreImplTestDelegate::PasswordStoreImplTestDelegate() {
OSCryptMocker::SetUp();
SetupTempDir();
store_ = CreateInitializedStore(std::make_unique<LoginDatabase>(
test_login_db_file_path(), IsAccountStore(false)));
}
PasswordStoreDefaultTestDelegate::PasswordStoreDefaultTestDelegate(
PasswordStoreImplTestDelegate::PasswordStoreImplTestDelegate(
std::unique_ptr<LoginDatabase> database) {
OSCryptMocker::SetUp();
SetupTempDir();
store_ = CreateInitializedStore(std::move(database));
}
PasswordStoreDefaultTestDelegate::~PasswordStoreDefaultTestDelegate() {
PasswordStoreImplTestDelegate::~PasswordStoreImplTestDelegate() {
ClosePasswordStore();
OSCryptMocker::TearDown();
}
void PasswordStoreDefaultTestDelegate::FinishAsyncProcessing() {
void PasswordStoreImplTestDelegate::FinishAsyncProcessing() {
task_environment_.RunUntilIdle();
}
void PasswordStoreDefaultTestDelegate::SetupTempDir() {
void PasswordStoreImplTestDelegate::SetupTempDir() {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
void PasswordStoreDefaultTestDelegate::ClosePasswordStore() {
void PasswordStoreImplTestDelegate::ClosePasswordStore() {
store_->ShutdownOnUIThread();
FinishAsyncProcessing();
ASSERT_TRUE(temp_dir_.Delete());
}
scoped_refptr<PasswordStoreDefault>
PasswordStoreDefaultTestDelegate::CreateInitializedStore(
scoped_refptr<PasswordStoreImpl>
PasswordStoreImplTestDelegate::CreateInitializedStore(
std::unique_ptr<LoginDatabase> database) {
scoped_refptr<PasswordStoreDefault> store(
new PasswordStoreDefault(std::move(database)));
scoped_refptr<PasswordStoreImpl> store(
new PasswordStoreImpl(std::move(database)));
store->Init(&prefs_);
return store;
}
base::FilePath PasswordStoreDefaultTestDelegate::test_login_db_file_path()
const {
base::FilePath PasswordStoreImplTestDelegate::test_login_db_file_path() const {
return temp_dir_.GetPath().Append(FILE_PATH_LITERAL("login_test"));
}
......@@ -156,11 +156,11 @@ base::FilePath PasswordStoreDefaultTestDelegate::test_login_db_file_path()
INSTANTIATE_TYPED_TEST_SUITE_P(Default,
PasswordStoreOriginTest,
PasswordStoreDefaultTestDelegate);
PasswordStoreImplTestDelegate);
TEST(PasswordStoreDefaultTest, NonASCIIData) {
PasswordStoreDefaultTestDelegate delegate;
PasswordStoreDefault* store = delegate.store();
TEST(PasswordStoreImplTest, NonASCIIData) {
PasswordStoreImplTestDelegate delegate;
PasswordStoreImpl* store = delegate.store();
// Some non-ASCII password form data.
static const PasswordFormData form_data[] = {
......@@ -188,9 +188,9 @@ TEST(PasswordStoreDefaultTest, NonASCIIData) {
delegate.FinishAsyncProcessing();
}
TEST(PasswordStoreDefaultTest, Notifications) {
PasswordStoreDefaultTestDelegate delegate;
PasswordStoreDefault* store = delegate.store();
TEST(PasswordStoreImplTest, Notifications) {
PasswordStoreImplTestDelegate delegate;
PasswordStoreImpl* store = delegate.store();
std::unique_ptr<PasswordForm> form =
FillPasswordFormWithData(CreateTestPasswordFormData());
......@@ -239,10 +239,9 @@ TEST(PasswordStoreDefaultTest, Notifications) {
// Verify that operations on a PasswordStore with a bad database cause no
// explosions, but fail without side effect, return no data and trigger no
// notifications.
TEST(PasswordStoreDefaultTest, OperationsOnABadDatabaseSilentlyFail) {
PasswordStoreDefaultTestDelegate delegate(
std::make_unique<BadLoginDatabase>());
PasswordStoreDefault* bad_store = delegate.store();
TEST(PasswordStoreImplTest, OperationsOnABadDatabaseSilentlyFail) {
PasswordStoreImplTestDelegate delegate(std::make_unique<BadLoginDatabase>());
PasswordStoreImpl* bad_store = delegate.store();
delegate.FinishAsyncProcessing();
ASSERT_EQ(nullptr, bad_store->login_db());
......
components/password_manager/core/browser/password_store_unittest.cc
View file @ 05b00ed4
......@@ -31,7 +31,7 @@
#include "components/password_manager/core/browser/password_reuse_detector.h"
#include "components/password_manager/core/browser/password_store.h"
#include "components/password_manager/core/browser/password_store_consumer.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "components/password_manager/core/browser/password_store_signin_notifier.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
......@@ -153,8 +153,8 @@ class PasswordStoreTest : public testing::Test {
return temp_dir_.GetPath().Append(FILE_PATH_LITERAL("login_test"));
}
scoped_refptr<PasswordStoreDefault> CreatePasswordStore() {
return new PasswordStoreDefault(std::make_unique<LoginDatabase>(
scoped_refptr<PasswordStoreImpl> CreatePasswordStore() {
return new PasswordStoreImpl(std::make_unique<LoginDatabase>(
test_login_db_file_path(), password_manager::IsAccountStore(false)));
}
......@@ -178,7 +178,7 @@ base::Optional<PasswordHashData> GetPasswordFromPref(
}
TEST_F(PasswordStoreTest, IgnoreOldWwwGoogleLogins) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
const time_t cutoff = 1325376000; // 00:00 Jan 1 2012 UTC
......@@ -286,7 +286,7 @@ TEST_F(PasswordStoreTest, UpdateLoginPrimaryKeyFields) {
L"", kTestLastUsageTime, 1}};
/* clang-format on */
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
std::unique_ptr<PasswordForm> old_form(
......@@ -337,7 +337,7 @@ TEST_F(PasswordStoreTest, RemoveLoginsCreatedBetweenCallbackIsCalled) {
L"", kTestLastUsageTime, 1};
/* clang-format on */
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
std::unique_ptr<PasswordForm> test_form(
......@@ -367,7 +367,7 @@ TEST_F(PasswordStoreTest, CompromisedCredentialsObserverOnRemoveLogin) {
kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
/* clang-format off */
......@@ -406,7 +406,7 @@ TEST_F(PasswordStoreTest, CompromisedCredentialsObserverOnLoginUpdated) {
CompromisedCredentials compromised_credentials(
kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
/* clang-format off */
......@@ -445,7 +445,7 @@ TEST_F(PasswordStoreTest, CompromisedCredentialsObserverOnLoginAdded) {
CompromisedCredentials compromised_credentials(
kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
/* clang-format off */
......@@ -497,7 +497,7 @@ TEST_F(PasswordStoreTest,
kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
store->AddLogin(*FillPasswordFormWithData(kTestCredentials));
store->AddDatabaseCompromisedCredentialsObserver(&observer);
......@@ -535,7 +535,7 @@ TEST_F(PasswordStoreTest,
kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
store->AddLogin(*FillPasswordFormWithData(kTestCredentials));
store->AddCompromisedCredentials(compromised_credentials);
......@@ -579,7 +579,7 @@ TEST_F(PasswordStoreTest,
kTestLastUsageTime,
1};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
store->AddLogin(*FillPasswordFormWithData(kTestCredentials));
store->AddCompromisedCredentials(compromised_credentials);
......@@ -625,7 +625,7 @@ TEST_F(PasswordStoreTest, GetLoginsWithoutAffiliations) {
L"", kTestLastUsageTime, 1}};
/* clang-format on */
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
std::vector<std::unique_ptr<PasswordForm>> all_credentials;
......@@ -724,7 +724,7 @@ TEST_F(PasswordStoreTest, GetLoginsWithAffiliations) {
false,
}};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
std::vector<std::unique_ptr<PasswordForm>> all_credentials;
......@@ -890,7 +890,7 @@ TEST_F(PasswordStoreTest, UpdatePasswordsStoredForAffiliatedWebsites) {
SCOPED_TRACE(testing::Message("test_remove_and_add_login: ")
<< test_remove_and_add_login);
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
store->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max(),
base::NullCallback());
......@@ -987,7 +987,7 @@ TEST_F(PasswordStoreTest, GetAllLogins) {
{PasswordForm::Scheme::kHtml, kTestWebRealm3, kTestWebOrigin3, "", L"",
L"", L"", nullptr, L"", kTestLastUsageTime, 1}};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
std::vector<std::unique_ptr<PasswordForm>> all_credentials;
......@@ -1037,7 +1037,7 @@ TEST_F(PasswordStoreTest, GetLogisByPassword) {
{PasswordForm::Scheme::kHtml, kTestWebRealm3, kTestWebOrigin3, "", L"",
L"", L"", nullptr, tested_password, kTestLastUsageTime, 1}};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
std::vector<std::unique_ptr<PasswordForm>> all_credentials;
......@@ -1092,7 +1092,7 @@ TEST_F(PasswordStoreTest, GetAllLoginsWithAffiliationAndBrandingInformation) {
{PasswordForm::Scheme::kHtml, kTestWebRealm3, kTestWebOrigin3, "", L"",
L"", L"", nullptr, L"", kTestLastUsageTime, 1}};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
std::vector<std::unique_ptr<PasswordForm>> all_credentials;
......@@ -1171,7 +1171,7 @@ TEST_F(PasswordStoreTest, Unblocklisting) {
kTestUnrelatedWebOrigin2, "", L"", L"", L"", L"username", L"",
kTestLastUsageTime, 1}};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
std::vector<std::unique_ptr<PasswordForm>> all_credentials;
......@@ -1217,7 +1217,7 @@ TEST_F(PasswordStoreTest, CheckPasswordReuse) {
"https://facebook.com", "", L"", L"", L"", L"username2", L"topsecret",
kTestLastUsageTime, 1}};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
for (const auto& test_credentials : kTestCredentials) {
......@@ -1259,7 +1259,7 @@ TEST_F(PasswordStoreTest, CheckPasswordReuse) {
}
TEST_F(PasswordStoreTest, SavingClearingProtectedPassword) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
TestingPrefServiceSimple prefs;
prefs.registry()->RegisterListPref(prefs::kPasswordHashDataList,
......@@ -1400,7 +1400,7 @@ TEST_F(PasswordStoreTest, SavingClearingProtectedPassword) {
}
TEST_F(PasswordStoreTest, SubscriptionAndUnsubscriptionFromSignInEvents) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
std::unique_ptr<MockPasswordStoreSigninNotifier> notifier =
std::make_unique<MockPasswordStoreSigninNotifier>();
......@@ -1417,7 +1417,7 @@ TEST_F(PasswordStoreTest, SubscriptionAndUnsubscriptionFromSignInEvents) {
}
TEST_F(PasswordStoreTest, ReportMetricsForAdvancedProtection) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
TestingPrefServiceSimple prefs;
prefs.registry()->RegisterListPref(prefs::kPasswordHashDataList,
......@@ -1451,7 +1451,7 @@ TEST_F(PasswordStoreTest, ReportMetricsForAdvancedProtection) {
}
TEST_F(PasswordStoreTest, ReportMetricsForNonSyncPassword) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
TestingPrefServiceSimple prefs;
prefs.registry()->RegisterListPref(prefs::kPasswordHashDataList,
......@@ -1497,7 +1497,7 @@ TEST_F(PasswordStoreTest, GetAllCompromisedCredentials) {
{PasswordForm::Scheme::kHtml, "https://2.example.com/",
"https://2.example.com/", "", L"", L"", L"", L"username2", L"topsecret",
kTestLastUsageTime, 1}};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
for (const auto& data : kTestCredentials)
......@@ -1533,7 +1533,7 @@ TEST_F(PasswordStoreTest, GetAllCompromisedCredentials) {
// Test GetMatchingCompromisedCredentials when affiliation service isn't
// available.
TEST_F(PasswordStoreTest, GetMatchingCompromisedWithoutAffiliations) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
constexpr PasswordFormData kTestCredentials[] = {
......@@ -1565,7 +1565,7 @@ TEST_F(PasswordStoreTest, GetMatchingCompromisedWithoutAffiliations) {
// Test GetMatchingCompromisedCredentials with some matching Android
// credentials.
TEST_F(PasswordStoreTest, GetMatchingCompromisedWithAffiliations) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
constexpr PasswordFormData kTestCredentials[] = {
......@@ -1618,7 +1618,7 @@ TEST_F(PasswordStoreTest, RemoveCompromisedCredentialsCreatedBetween) {
"https://example3.com/", base::ASCIIToUTF16("username3"),
base::Time::FromTimeT(300), CompromiseType::kLeaked, false);
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
constexpr PasswordFormData kTestCredentials[] = {
{PasswordForm::Scheme::kHtml, "https://example1.com/",
......@@ -1666,7 +1666,7 @@ TEST_F(PasswordStoreTest, RemoveCompromisedCredentialsCreatedBetween) {
// Test that updating a password in the store deletes the corresponding
// compromised record synchronously.
TEST_F(PasswordStoreTest, RemoveCompromisedCredentialsSyncOnUpdate) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
CompromisedCredentials compromised_credentials(
......@@ -1702,7 +1702,7 @@ TEST_F(PasswordStoreTest, RemoveCompromisedCredentialsSyncOnUpdate) {
// Test that deleting a password in the store deletes the corresponding
// compromised record synchronously.
TEST_F(PasswordStoreTest, RemoveCompromisedCredentialsSyncOnDelete) {
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
CompromisedCredentials compromised_credentials(
......@@ -1744,7 +1744,7 @@ TEST_F(PasswordStoreTest, GetAllFieldInfo) {
FieldInfo field_info2{autofill::FormSignature(1002),
autofill::FieldSignature(10), autofill::PASSWORD,
base::Time::FromTimeT(2)};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
store->AddFieldInfo(field_info1);
......@@ -1770,7 +1770,7 @@ TEST_F(PasswordStoreTest, RemoveFieldInfo) {
autofill::FieldSignature(11), autofill::PASSWORD,
base::Time::FromTimeT(300)};
scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
scoped_refptr<PasswordStoreImpl> store = CreatePasswordStore();
store->Init(nullptr);
store->AddFieldInfo(field_info1);
......
ios/chrome/browser/credential_provider/credential_provider_service_unittest.mm
View file @ 05b00ed4
......@@ -8,7 +8,7 @@
#include "base/strings/utf_string_conversions.h"
#import "base/test/ios/wait_util.h"
#include "components/password_manager/core/browser/password_form.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#include "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_fake.h"
......@@ -31,7 +31,7 @@ namespace {
using password_manager::PasswordForm;
using base::test::ios::WaitUntilConditionOrTimeout;
using base::test::ios::kWaitForFileOperationTimeout;
using password_manager::PasswordStoreDefault;
using password_manager::PasswordStoreImpl;
using password_manager::LoginDatabase;
class CredentialProviderServiceTest : public PlatformTest {
......@@ -75,8 +75,8 @@ class CredentialProviderServiceTest : public PlatformTest {
PlatformTest::TearDown();
}
scoped_refptr<PasswordStoreDefault> CreatePasswordStore() {
return base::MakeRefCounted<PasswordStoreDefault>(
scoped_refptr<PasswordStoreImpl> CreatePasswordStore() {
return base::MakeRefCounted<PasswordStoreImpl>(
std::make_unique<LoginDatabase>(
temp_dir_.GetPath().Append(FILE_PATH_LITERAL("login_test")),
password_manager::IsAccountStore(false)));
......@@ -85,7 +85,7 @@ class CredentialProviderServiceTest : public PlatformTest {
protected:
base::ScopedTempDir temp_dir_;
web::WebTaskEnvironment task_environment_;
scoped_refptr<PasswordStoreDefault> password_store_;
scoped_refptr<PasswordStoreImpl> password_store_;
ArchivableCredentialStore* credential_store_;
AuthenticationServiceFake* auth_service_;
std::unique_ptr<CredentialProviderService> credential_provider_service_;
......
ios/chrome/browser/passwords/ios_chrome_password_store_factory.cc
View file @ 05b00ed4
......@@ -19,8 +19,8 @@
#include "components/keyed_service/ios/browser_state_dependency_manager.h"
#include "components/password_manager/core/browser/login_database.h"
#include "components/password_manager/core/browser/password_manager_util.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_factory_util.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "components/password_manager/core/browser/password_store_signin_notifier_impl.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/signin/public/identity_manager/identity_manager.h"
......@@ -123,7 +123,7 @@ IOSChromePasswordStoreFactory::BuildServiceInstanceFor(
{base::MayBlock(), base::TaskPriority::USER_VISIBLE}));
scoped_refptr<password_manager::PasswordStore> store =
new password_manager::PasswordStoreDefault(std::move(login_db));
new password_manager::PasswordStoreImpl(std::move(login_db));
if (!store->Init(nullptr)) {
// TODO(crbug.com/479725): Remove the LOG once this error is visible in the
// UI.
......
ios/web_view/internal/autofill/cwv_autofill_data_manager.mm
View file @ 05b00ed4
......@@ -11,7 +11,7 @@
#include "components/autofill/core/browser/personal_data_manager.h"
#include "components/autofill/core/browser/personal_data_manager_observer.h"
#include "components/password_manager/core/browser/password_store_consumer.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "ios/web/public/thread/web_task_traits.h"
#include "ios/web/public/thread/web_thread.h"
#import "ios/web_view/internal/autofill/cwv_autofill_profile_internal.h"
......
ios/web_view/internal/cwv_web_view_configuration.mm
View file @ 05b00ed4
......@@ -8,7 +8,7 @@
#include "base/threading/thread_restrictions.h"
#include "components/keyed_service/core/service_access_type.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "components/sync/driver/sync_service.h"
#include "ios/web_view/internal/app/application_context.h"
#import "ios/web_view/internal/autofill/cwv_autofill_data_manager_internal.h"
......
ios/web_view/internal/passwords/web_view_account_password_store_factory.mm
View file @ 05b00ed4
......@@ -14,8 +14,8 @@
#include "components/password_manager/core/browser/login_database.h"
#include "components/password_manager/core/browser/password_manager_constants.h"
#include "components/password_manager/core/browser/password_manager_util.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_factory_util.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/prefs/pref_service.h"
#include "ios/web/public/thread/web_task_traits.h"
......@@ -104,7 +104,7 @@ WebViewAccountPasswordStoreFactory::BuildServiceInstanceFor(
browser_state->GetStatePath()));
scoped_refptr<password_manager::PasswordStore> ps =
new password_manager::PasswordStoreDefault(std::move(login_db));
new password_manager::PasswordStoreImpl(std::move(login_db));
if (!ps->Init(browser_state->GetPrefs(),
base::BindRepeating(&SyncEnabledOrDisabled, browser_state))) {
// TODO(crbug.com/479725): Remove the LOG once this error is visible in the
......
ios/web_view/internal/passwords/web_view_password_store_factory.mm
View file @ 05b00ed4
......@@ -17,8 +17,8 @@
#include "components/keyed_service/core/service_access_type.h"
#include "components/keyed_service/ios/browser_state_dependency_manager.h"
#include "components/password_manager/core/browser/login_database.h"
#include "components/password_manager/core/browser/password_store_default.h"
#include "components/password_manager/core/browser/password_store_factory_util.h"
#include "components/password_manager/core/browser/password_store_impl.h"
#include "components/sync/driver/sync_service.h"
#include "ios/web_view/internal/app/application_context.h"
#import "ios/web_view/internal/sync/web_view_profile_sync_service_factory.h"
......@@ -79,7 +79,7 @@ WebViewPasswordStoreFactory::BuildServiceInstanceFor(
{base::MayBlock(), base::TaskPriority::USER_VISIBLE}));
scoped_refptr<password_manager::PasswordStore> store =
new password_manager::PasswordStoreDefault(std::move(login_db));
new password_manager::PasswordStoreImpl(std::move(login_db));
if (!store->Init(nullptr)) {
// TODO(crbug.com/479725): Remove the LOG once this error is visible in the
// UI.
......
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