[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: Eugene But <eugenebut@chromium.org>
Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835747}

chrome/browser/password_manager/account_password_store_factory.cc

@@ -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

@@ -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

@@ -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.h → components/password_manager/core/browser/password_store_impl.h

@@ -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

@@ -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());
 

ios/chrome/browser/credential_provider/credential_provider_service_unittest.mm

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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.