Delete PasswordStoreMac and SimplePasswordStoreMac.

chrome/browser/password_manager/password_store_proxy_mac.cc

Index: chrome/browser/password_manager/password_store_proxy_mac.cc
diff --git a/chrome/browser/password_manager/password_store_proxy_mac.cc b/chrome/browser/password_manager/password_store_proxy_mac.cc
index fb3bf932b59e260ba428cfbbefe20696440de6d5..a3dfece1944530895f499bac4c3640a0275811ba 100644
--- a/chrome/browser/password_manager/password_store_proxy_mac.cc
+++ b/chrome/browser/password_manager/password_store_proxy_mac.cc
@@ -4,35 +4,19 @@
 
 #include "chrome/browser/password_manager/password_store_proxy_mac.h"
 
-#include <string>
-#include <utility>
-
 #include "base/metrics/histogram_macros.h"
-#include "chrome/browser/password_manager/password_store_mac.h"
-#include "chrome/browser/password_manager/simple_password_store_mac.h"
+#include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "content/public/browser/browser_thread.h"
-#include "crypto/apple_keychain.h"
 
 using password_manager::MigrationStatus;
-using password_manager::PasswordStoreChangeList;
 
 PasswordStoreProxyMac::PasswordStoreProxyMac(
     scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
-    std::unique_ptr<crypto::AppleKeychain> keychain,
     std::unique_ptr<password_manager::LoginDatabase> login_db,
     PrefService* prefs)
-    : PasswordStore(main_thread_runner, nullptr),
-      login_metadata_db_(std::move(login_db)),
-      keychain_(std::move(keychain)) {
-  DCHECK(login_metadata_db_);
+    : PasswordStoreDefault(main_thread_runner, nullptr, std::move(login_db)) {
   migration_status_.Init(password_manager::prefs::kKeychainMigrationStatus,
                          prefs);
-  // The login database will be set later after initialization.
-  password_store_simple_ =
-      new SimplePasswordStoreMac(main_thread_runner, nullptr, nullptr);
-}
-
-PasswordStoreProxyMac::~PasswordStoreProxyMac() {
 }
 
 bool PasswordStoreProxyMac::Init(
@@ -47,26 +31,22 @@ bool PasswordStoreProxyMac::Init(
     return false;
   }
 
-  if (!ScheduleTask(base::Bind(
-          &PasswordStoreProxyMac::InitOnBackgroundThread, this,
-          static_cast<MigrationStatus>(migration_status_.GetValue()))))
-    return false;
+  if (PasswordStoreDefault::Init(flare, prefs)) {
+    return ScheduleTask(
+        base::Bind(&PasswordStoreProxyMac::InitOnBackgroundThread, this,
+                   static_cast<MigrationStatus>(migration_status_.GetValue())));
+  }
 
-  return password_manager::PasswordStore::Init(flare, prefs);
+  return false;
 }
 
 void PasswordStoreProxyMac::ShutdownOnUIThread() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  PasswordStore::ShutdownOnUIThread();
+  PasswordStoreDefault::ShutdownOnUIThread();
   thread_->Stop();
 
-  // Execute the task which are still pending.
-  FlushPendingTasks();
-
   // Unsubscribe the observer, otherwise it's too late in the destructor.
   migration_status_.Destroy();
-
-  GetBackend()->ShutdownOnUIThread();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
@@ -74,43 +54,23 @@ PasswordStoreProxyMac::GetBackgroundTaskRunner() {
   return thread_ ? thread_->task_runner() : nullptr;
 }
 
-password_manager::PasswordStore* PasswordStoreProxyMac::GetBackend() const {
-  return password_store_simple_.get();
-}
+PasswordStoreProxyMac::~PasswordStoreProxyMac() = default;
 
 void PasswordStoreProxyMac::InitOnBackgroundThread(MigrationStatus status) {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
-  if (!login_metadata_db_->Init()) {
-    login_metadata_db_.reset();
-    LOG(ERROR) << "Could not create/open login database.";
-  }
 
-  if (login_metadata_db_ && (status == MigrationStatus::NOT_STARTED ||
-                             status == MigrationStatus::FAILED_ONCE ||
-                             status == MigrationStatus::FAILED_TWICE)) {
+  if (login_db() && (status == MigrationStatus::NOT_STARTED ||
+                     status == MigrationStatus::FAILED_ONCE ||
+                     status == MigrationStatus::FAILED_TWICE)) {
     // Migration isn't possible due to Chrome changing the certificate. Just
     // drop the entries in the DB because they don't have passwords anyway.
-    login_metadata_db_->RemoveLoginsCreatedBetween(base::Time(), base::Time());
+    login_db()->RemoveLoginsCreatedBetween(base::Time(), base::Time());
     status = MigrationStatus::MIGRATION_STOPPED;
-    pending_ui_tasks_.push_back(
+    main_thread_runner_->PostTask(
+        FROM_HERE,
         base::Bind(&PasswordStoreProxyMac::UpdateStatusPref, this, status));
-  } else if (login_metadata_db_ && status == MigrationStatus::MIGRATED) {
-    // Delete the migrated passwords from the keychain.
-    std::vector<std::unique_ptr<autofill::PasswordForm>> forms;
-    if (login_metadata_db_->GetAutofillableLogins(&forms)) {
-      PasswordStoreMac::CleanUpKeychain(keychain_.get(), forms);
-      status = MigrationStatus::MIGRATED_DELETED;
-      pending_ui_tasks_.push_back(
-          base::Bind(&PasswordStoreProxyMac::UpdateStatusPref, this, status));
-    }
   }
 
-  password_store_simple_->InitWithTaskRunner(GetBackgroundTaskRunner(),
-                                             std::move(login_metadata_db_));
-  if (!pending_ui_tasks_.empty()) {
-    main_thread_runner_->PostTask(
-        FROM_HERE, base::Bind(&PasswordStoreProxyMac::FlushPendingTasks, this));
-  }
   UMA_HISTOGRAM_ENUMERATION(
       "PasswordManager.KeychainMigration.Status", static_cast<int>(status),
       static_cast<int>(MigrationStatus::MIGRATION_STATUS_COUNT));
@@ -118,108 +78,7 @@ void PasswordStoreProxyMac::InitOnBackgroundThread(MigrationStatus status) {
 
 void PasswordStoreProxyMac::UpdateStatusPref(MigrationStatus status) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  migration_status_.SetValue(static_cast<int>(status));
-}
-
-void PasswordStoreProxyMac::FlushPendingTasks() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  for (auto& task : pending_ui_tasks_)
-    task.Run();
-  pending_ui_tasks_.clear();
-}
-
-void PasswordStoreProxyMac::ReportMetricsImpl(
-    const std::string& sync_username,
-    bool custom_passphrase_sync_enabled) {
-  GetBackend()->ReportMetricsImpl(sync_username,
-                                  custom_passphrase_sync_enabled);
-}
-
-PasswordStoreChangeList PasswordStoreProxyMac::AddLoginImpl(
-    const autofill::PasswordForm& form) {
-  return GetBackend()->AddLoginImpl(form);
-}
-
-PasswordStoreChangeList PasswordStoreProxyMac::UpdateLoginImpl(
-    const autofill::PasswordForm& form) {
-  return GetBackend()->UpdateLoginImpl(form);
-}
-
-PasswordStoreChangeList PasswordStoreProxyMac::RemoveLoginImpl(
-    const autofill::PasswordForm& form) {
-  return GetBackend()->RemoveLoginImpl(form);
-}
-
-PasswordStoreChangeList PasswordStoreProxyMac::RemoveLoginsByURLAndTimeImpl(
-    const base::Callback<bool(const GURL&)>& url_filter,
-    base::Time delete_begin,
-    base::Time delete_end) {
-  return GetBackend()->RemoveLoginsByURLAndTimeImpl(url_filter, delete_begin,
-                                                    delete_end);
-}
-
-PasswordStoreChangeList PasswordStoreProxyMac::RemoveLoginsCreatedBetweenImpl(
-    base::Time delete_begin,
-    base::Time delete_end) {
-  return GetBackend()->RemoveLoginsCreatedBetweenImpl(delete_begin, delete_end);
-}
-
-PasswordStoreChangeList PasswordStoreProxyMac::RemoveLoginsSyncedBetweenImpl(
-    base::Time delete_begin,
-    base::Time delete_end) {
-  return GetBackend()->RemoveLoginsSyncedBetweenImpl(delete_begin, delete_end);
-}
-
-PasswordStoreChangeList
-PasswordStoreProxyMac::DisableAutoSignInForOriginsImpl(
-    const base::Callback<bool(const GURL&)>& origin_filter) {
-  return GetBackend()->DisableAutoSignInForOriginsImpl(origin_filter);
-}
-
-bool PasswordStoreProxyMac::RemoveStatisticsByOriginAndTimeImpl(
-    const base::Callback<bool(const GURL&)>& origin_filter,
-    base::Time delete_begin,
-    base::Time delete_end) {
-  return GetBackend()->RemoveStatisticsByOriginAndTimeImpl(
-      origin_filter, delete_begin, delete_end);
-}
-
-std::vector<std::unique_ptr<autofill::PasswordForm>>
-PasswordStoreProxyMac::FillMatchingLogins(const FormDigest& form) {
-  return GetBackend()->FillMatchingLogins(form);
-}
-
-std::vector<std::unique_ptr<autofill::PasswordForm>>
-PasswordStoreProxyMac::FillLoginsForSameOrganizationName(
-    const std::string& signon_realm) {
-  return GetBackend()->FillLoginsForSameOrganizationName(signon_realm);
-}
-
-bool PasswordStoreProxyMac::FillAutofillableLogins(
-    std::vector<std::unique_ptr<autofill::PasswordForm>>* forms) {
-  return GetBackend()->FillAutofillableLogins(forms);
-}
-
-bool PasswordStoreProxyMac::FillBlacklistLogins(
-    std::vector<std::unique_ptr<autofill::PasswordForm>>* forms) {
-  return GetBackend()->FillBlacklistLogins(forms);
-}
-
-void PasswordStoreProxyMac::AddSiteStatsImpl(
-    const password_manager::InteractionsStats& stats) {
-  GetBackend()->AddSiteStatsImpl(stats);
-}
-
-void PasswordStoreProxyMac::RemoveSiteStatsImpl(const GURL& origin_domain) {
-  GetBackend()->RemoveSiteStatsImpl(origin_domain);
-}
-
-std::vector<password_manager::InteractionsStats>
-PasswordStoreProxyMac::GetAllSiteStatsImpl() {
-  return GetBackend()->GetAllSiteStatsImpl();
-}
-
-std::vector<password_manager::InteractionsStats>
-PasswordStoreProxyMac::GetSiteStatsImpl(const GURL& origin_domain) {
-  return GetBackend()->GetSiteStatsImpl(origin_domain);
+  // The method can be called after ShutdownOnUIThread().
+  if (migration_status_.prefs())
+    migration_status_.SetValue(static_cast<int>(status));
 }