Refactor CredentialManagerImpl::RequireUserMediation method.

components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.cc

Index: components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.cc
diff --git a/components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.cc b/components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.cc
index 85294376828a2e3992ed3adfa5aa8c8a44bef352..79cfe6b1816edd8136ebc3ebaed0a7eddc0d24d2 100644
--- a/components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.cc
+++ b/components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.cc
@@ -5,35 +5,21 @@
 #include "components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.h"
 
 #include "components/autofill/core/common/password_form.h"
-#include "components/password_manager/core/browser/affiliated_match_helper.h"
-#include "components/password_manager/core/browser/password_store.h"
-#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-#include "url/gurl.h"
 
 namespace password_manager {
 
 CredentialManagerPendingRequireUserMediationTask::
     CredentialManagerPendingRequireUserMediationTask(
-        CredentialManagerPendingRequireUserMediationTaskDelegate* delegate,
-        const GURL& origin,
-        const std::vector<std::string>& affiliated_realms)
-    : delegate_(delegate),
-      affiliated_realms_(affiliated_realms.begin(), affiliated_realms.end()) {
-  registrable_domains_.insert(
-      net::registry_controlled_domains::GetDomainAndRegistry(
-          origin,
-          net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
-}
+        CredentialManagerPendingRequireUserMediationTaskDelegate* delegate)
+    : delegate_(delegate), pending_requests_(0) {}
 
 CredentialManagerPendingRequireUserMediationTask::
     ~CredentialManagerPendingRequireUserMediationTask() = default;
 
 void CredentialManagerPendingRequireUserMediationTask::AddOrigin(
-    const GURL& origin) {
-  registrable_domains_.insert(
-      net::registry_controlled_domains::GetDomainAndRegistry(
-          origin,
-          net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
+    const PasswordStore::FormDigest& form_digest) {
+  delegate_->GetPasswordStore()->GetLogins(form_digest, this);
+  pending_requests_++;
 }
 
 void CredentialManagerPendingRequireUserMediationTask::
@@ -41,23 +27,14 @@ void CredentialManagerPendingRequireUserMediationTask::
         std::vector<std::unique_ptr<autofill::PasswordForm>> results) {
   PasswordStore* store = delegate_->GetPasswordStore();
   for (const auto& form : results) {
-    std::string form_registrable_domain =
-        net::registry_controlled_domains::GetDomainAndRegistry(
-            form->origin,
-            net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
-    if (registrable_domains_.count(form_registrable_domain) ||
-        (affiliated_realms_.count(form->signon_realm) &&
-         AffiliatedMatchHelper::IsValidAndroidCredential(
-             PasswordStore::FormDigest(*form)))) {
+    if (!form->skip_zero_click) {
       form->skip_zero_click = true;
-      // Note that UpdateLogin ends up copying the form while posting a task to
-      // update the PasswordStore, so it's fine to let |results| delete the
-      // original at the end of this method.
       store->UpdateLogin(*form);
     }
   }
-
-  delegate_->DoneRequiringUserMediation();
+  pending_requests_--;
+  if (!pending_requests_)
+    delegate_->DoneRequiringUserMediation();
 }
 
 }  // namespace password_manager