[Passwords] Use strong alias when constructing a TestPasswordStore

Change-Id: Ifc007754b08fad94f9e433311d7f84bae571e6b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2374450Reviewed-by: John Wu <jzw@chromium.org>
Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801484}

components/password_manager/core/browser/credential_manager_impl_unittest.cc

@@ -222,7 +222,7 @@ class CredentialManagerImplTest : public testing::Test,
     store_->Init(/*prefs=*/nullptr);
     if (base::FeatureList::IsEnabled(
             features::kEnablePasswordsAccountStorage)) {
-      account_store_ = new TestPasswordStore(/*is_account_store=*/true);
+      account_store_ = new TestPasswordStore(IsAccountStore(true));
       ASSERT_TRUE(account_store_->Init(/*prefs=*/nullptr));
     }
     client_ = std::make_unique<testing::NiceMock<MockPasswordManagerClient>>(

components/password_manager/core/browser/credential_manager_pending_prevent_silent_access_task_unittest.cc

@@ -31,10 +31,10 @@ class CredentialManagerPendingPreventSilentAccessTaskTest
     : public ::testing::Test {
  public:
   CredentialManagerPendingPreventSilentAccessTaskTest() {
-    profile_store_ = new TestPasswordStore(/*is_account_store=*/false);
+    profile_store_ = new TestPasswordStore(IsAccountStore(false));
     profile_store_->Init(/*prefs=*/nullptr);
 
-    account_store_ = new TestPasswordStore(/*is_account_store=*/true);
+    account_store_ = new TestPasswordStore(IsAccountStore(true));
     account_store_->Init(/*prefs=*/nullptr);
   }
   ~CredentialManagerPendingPreventSilentAccessTaskTest() override = default;

components/password_manager/core/browser/credential_manager_pending_request_task_unittest.cc

@@ -73,10 +73,10 @@ class CredentialManagerPendingRequestTaskDelegateMock
 class CredentialManagerPendingRequestTaskTest : public ::testing::Test {
  public:
   CredentialManagerPendingRequestTaskTest() {
-    profile_store_ = new TestPasswordStore(/*is_account_store=*/false);
+    profile_store_ = new TestPasswordStore(IsAccountStore(false));
     profile_store_->Init(/*prefs=*/nullptr);
 
-    account_store_ = new TestPasswordStore(/*is_account_store=*/true);
+    account_store_ = new TestPasswordStore(IsAccountStore(true));
     account_store_->Init(/*prefs=*/nullptr);
 
     client_ = std::make_unique<TestPasswordManagerClient>(profile_store_.get(),

components/password_manager/core/browser/login_database.h

@@ -15,7 +15,6 @@
 #include "base/macros.h"
 #include "base/pickle.h"
 #include "base/strings/string16.h"
-#include "base/util/type_safety/strong_alias.h"
 #include "build/build_config.h"
 #include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/field_info_table.h"
@@ -44,8 +43,6 @@ class SQLTableBuilder;
 extern const int kCurrentVersionNumber;
 extern const int kCompatibleVersionNumber;
 
-using IsAccountStore = util::StrongAlias<class IsAccountStoreTag, bool>;
-
 // Interface to the database storage of login information, intended as a helper
 // for PasswordStore on platforms that need internal storage of some or all of
 // the login information.

components/password_manager/core/browser/password_store.h

@@ -20,6 +20,7 @@
 #include "base/observer_list_threadsafe.h"
 #include "base/sequenced_task_runner.h"
 #include "base/time/time.h"
+#include "base/util/type_safety/strong_alias.h"
 #include "build/build_config.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "components/password_manager/core/browser/compromised_credentials_table.h"
@@ -50,6 +51,8 @@ using StateSubscription =
 
 namespace password_manager {
 
+using IsAccountStore = util::StrongAlias<class IsAccountStoreTag, bool>;
+
 #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
 using metrics_util::GaiaPasswordHashChange;
 #endif

components/password_manager/core/browser/store_metrics_reporter_unittest.cc

@@ -122,9 +122,9 @@ TEST_P(StoreMetricsReporterTestWithParams, StoreDependentMetrics) {
 // StoreMetricsReporter directly.
 TEST_F(StoreMetricsReporterTest, MultiStoreMetrics) {
   auto profile_store =
-      base::MakeRefCounted<TestPasswordStore>(/*is_account_store=*/false);
+      base::MakeRefCounted<TestPasswordStore>(IsAccountStore(false));
   auto account_store =
-      base::MakeRefCounted<TestPasswordStore>(/*is_account_store=*/true);
+      base::MakeRefCounted<TestPasswordStore>(IsAccountStore(true));
   profile_store->Init(&prefs_);
   account_store->Init(&prefs_);
 

components/password_manager/core/browser/test_password_store.cc

@@ -110,7 +110,8 @@ bool TestPasswordSyncMetadataStore::HasUnsyncedDeletions() {
 
 }  // namespace
 
-TestPasswordStore::TestPasswordStore(bool is_account_store)
+TestPasswordStore::TestPasswordStore(
+    password_manager::IsAccountStore is_account_store)
     : is_account_store_(is_account_store),
       metadata_store_(std::make_unique<TestPasswordSyncMetadataStore>()) {}
 
@@ -159,7 +160,7 @@ PasswordStoreChangeList TestPasswordStore::AddLoginImpl(
     changes.emplace_back(PasswordStoreChange::REMOVE, *iter);
     changes.emplace_back(PasswordStoreChange::ADD, form);
     *iter = form;
-    iter->in_store = is_account_store_
+    iter->in_store = IsAccountStore()
                          ? autofill::PasswordForm::Store::kAccountStore
                          : autofill::PasswordForm::Store::kProfileStore;
     return changes;
@@ -168,8 +169,8 @@ PasswordStoreChangeList TestPasswordStore::AddLoginImpl(
   changes.emplace_back(PasswordStoreChange::ADD, form);
   passwords_for_signon_realm.push_back(form);
   passwords_for_signon_realm.back().in_store =
-      is_account_store_ ? autofill::PasswordForm::Store::kAccountStore
-                        : autofill::PasswordForm::Store::kProfileStore;
+      IsAccountStore() ? autofill::PasswordForm::Store::kAccountStore
+                       : autofill::PasswordForm::Store::kProfileStore;
   return changes;
 }
 
@@ -185,7 +186,7 @@ PasswordStoreChangeList TestPasswordStore::UpdateLoginImpl(
   for (auto& stored_form : forms) {
     if (ArePasswordFormUniqueKeysEqual(form, stored_form)) {
       stored_form = form;
-      stored_form.in_store = is_account_store_
+      stored_form.in_store = IsAccountStore()
                                  ? autofill::PasswordForm::Store::kAccountStore
                                  : autofill::PasswordForm::Store::kProfileStore;
       changes.push_back(PasswordStoreChange(PasswordStoreChange::UPDATE, form));
@@ -338,7 +339,7 @@ std::vector<InteractionsStats> TestPasswordStore::GetAllSiteStatsImpl() {
 bool TestPasswordStore::AddCompromisedCredentialsImpl(
     const CompromisedCredentials& compromised_credentials) {
   CompromisedCredentials cred = compromised_credentials;
-  cred.in_store = is_account_store_
+  cred.in_store = IsAccountStore()
                       ? autofill::PasswordForm::Store::kAccountStore
                       : autofill::PasswordForm::Store::kProfileStore;
   return compromised_credentials_.insert(std::move(cred)).second;
@@ -452,7 +453,7 @@ PasswordStoreSync::MetadataStore* TestPasswordStore::GetMetadataStore() {
 }
 
 bool TestPasswordStore::IsAccountStore() const {
-  return is_account_store_;
+  return is_account_store_.value();
 }
 
 bool TestPasswordStore::DeleteAndRecreateDatabaseFile() {

components/password_manager/core/browser/test_password_store.h

@@ -35,7 +35,11 @@ MATCHER_P(MatchesFormExceptStore, expected, "") {
 // for testing have been implemented.
 class TestPasswordStore : public PasswordStore {
  public:
-  explicit TestPasswordStore(bool is_account_store = false);
+  // We need to qualify password_manager::IsAccountStore with the full
+  // namespace, otherwise, it's confused with the method
+  // PasswordStoreSync::IsAccountStore().
+  explicit TestPasswordStore(password_manager::IsAccountStore is_account_store =
+                                 password_manager::IsAccountStore(false));
 
   using PasswordMap = std::map<std::string /* signon_realm */,
                                std::vector<autofill::PasswordForm>,
@@ -150,7 +154,7 @@ class TestPasswordStore : public PasswordStore {
   bool DeleteAndRecreateDatabaseFile() override;
 
  private:
-  const bool is_account_store_;
+  const password_manager::IsAccountStore is_account_store_;
 
   PasswordMap stored_passwords_;
   CompromisedCredentialsStorage compromised_credentials_;

components/password_manager/core/browser/ui/compromised_credentials_manager_unittest.cc

@@ -543,9 +543,9 @@ class CompromisedCredentialsManagerWithTwoStoresTest : public ::testing::Test {
  private:
   base::test::SingleThreadTaskEnvironment task_env_;
   scoped_refptr<TestPasswordStore> profile_store_ =
-      base::MakeRefCounted<TestPasswordStore>(/*is_account_store=*/false);
+      base::MakeRefCounted<TestPasswordStore>(IsAccountStore(false));
   scoped_refptr<TestPasswordStore> account_store_ =
-      base::MakeRefCounted<TestPasswordStore>(/*is_account_store=*/true);
+      base::MakeRefCounted<TestPasswordStore>(IsAccountStore(true));
   SavedPasswordsPresenter presenter_{profile_store_, account_store_};
   CompromisedCredentialsManager provider_{&presenter_, profile_store_,
                                           account_store_};

components/password_manager/core/browser/ui/compromised_credentials_reader_unittest.cc

@@ -53,9 +53,9 @@ class CompromisedCredentialsReaderTest : public ::testing::Test {
  private:
   base::test::SingleThreadTaskEnvironment task_env_;
   scoped_refptr<TestPasswordStore> profile_store_ =
-      base::MakeRefCounted<TestPasswordStore>(/*is_account_store=*/false);
+      base::MakeRefCounted<TestPasswordStore>(IsAccountStore(false));
   scoped_refptr<TestPasswordStore> account_store_ =
-      base::MakeRefCounted<TestPasswordStore>(/*is_account_store=*/true);
+      base::MakeRefCounted<TestPasswordStore>(IsAccountStore(true));
   CompromisedCredentialsReader reader_{profile_store_.get(),
                                        account_store_.get()};
 };

components/password_manager/core/browser/ui/saved_passwords_presenter_unittest.cc

@@ -175,9 +175,9 @@ class SavedPasswordsPresenterWithTwoStoresTest : public ::testing::Test {
  private:
   base::test::SingleThreadTaskEnvironment task_env_;
   scoped_refptr<TestPasswordStore> profile_store_ =
-      base::MakeRefCounted<TestPasswordStore>(/*is_account_store=*/false);
+      base::MakeRefCounted<TestPasswordStore>(IsAccountStore(false));
   scoped_refptr<TestPasswordStore> account_store_ =
-      base::MakeRefCounted<TestPasswordStore>(/*is_account_store=*/true);
+      base::MakeRefCounted<TestPasswordStore>(IsAccountStore(true));
   SavedPasswordsPresenter presenter_{profile_store_, account_store_};
 };
 

ios/web_view/internal/passwords/web_view_password_manager_client_unittest.mm

@@ -46,7 +46,7 @@ class WebViewPasswordManagerClientTest : public PlatformTest {
             base::MakeRefCounted<password_manager::TestPasswordStore>()),
         account_store_(
             base::MakeRefCounted<password_manager::TestPasswordStore>(
-                /*is_account_store=*/true)) {
+                password_manager::IsAccountStore(true))) {
     scoped_feature.InitAndEnableFeature(
         password_manager::features::kEnablePasswordsAccountStorage);
 

ios/web_view/internal/sync/web_view_sync_client_unittest.mm

@@ -46,7 +46,7 @@ class WebViewSyncClientTest : public PlatformTest {
             base::FeatureList::IsEnabled(
                 password_manager::features::kEnablePasswordsAccountStorage)
                 ? base::MakeRefCounted<password_manager::TestPasswordStore>(
-                      /*is_account_store=*/true)
+                      password_manager::IsAccountStore(true))
                 : nullptr),
         client_(profile_web_data_service_.get(),
                 account_web_data_service_.get(),