[Passwords] Introduce OnGetCompromisedCredentialsFrom() in ...

... in CompromisedCredentialsConsumer.
This is similar to OnGetCompromisedCredentials(), but also receives
the  originating PasswordStore as a parameter.

Bug: 1108422
Change-Id: Icc4e8135f4181b17f23fbee23666d20ad4f04277
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367717
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800545}

components/password_manager/core/browser/compromised_credentials_consumer.cc

@@ -12,4 +12,10 @@ CompromisedCredentialsConsumer::CompromisedCredentialsConsumer() = default;
 
 CompromisedCredentialsConsumer::~CompromisedCredentialsConsumer() = default;
 
+void CompromisedCredentialsConsumer::OnGetCompromisedCredentialsFrom(
+    PasswordStore* store,
+    std::vector<CompromisedCredentials> compromised_credentials) {
+  OnGetCompromisedCredentials(std::move(compromised_credentials));
+}
+
 }  // namespace password_manager

components/password_manager/core/browser/compromised_credentials_consumer.h

@@ -12,6 +12,7 @@
 namespace password_manager {
 
 struct CompromisedCredentials;
+class PasswordStore;
 
 // Reads information associated with compromised credentials history from the
 // PasswordStore. Reads are done asynchronously on a separate thread. It
@@ -27,6 +28,15 @@ class CompromisedCredentialsConsumer {
   virtual void OnGetCompromisedCredentials(
       std::vector<CompromisedCredentials> compromised_credentials) = 0;
 
+  // Like OnGetCompromisedCredentials(), but also receives the originating
+  // PasswordStore as a parameter. This is useful for consumers that query
+  // both the profile-scoped and the account-scoped store. The default
+  // implementation simply calls OnGetCompromisedCredentials(), so consumers
+  // that don't care about the store can just ignore this.
+  virtual void OnGetCompromisedCredentialsFrom(
+      PasswordStore* store,
+      std::vector<CompromisedCredentials> compromised_credentials);
+
   // The base::CancelableTaskTracker can be used for cancelling the tasks
   // associated with the consumer.
   base::CancelableTaskTracker* cancelable_task_tracker() {

components/password_manager/core/browser/password_store.cc

@@ -933,8 +933,8 @@ void PasswordStore::PostCompromisedCredentialsTaskAndReplyToConsumerWithResult(
   consumer->cancelable_task_tracker()->PostTaskAndReplyWithResult(
       background_task_runner_.get(), FROM_HERE, std::move(task),
       base::BindOnce(
-          &CompromisedCredentialsConsumer::OnGetCompromisedCredentials,
-          consumer->GetWeakPtr()));
+          &CompromisedCredentialsConsumer::OnGetCompromisedCredentialsFrom,
+          consumer->GetWeakPtr(), base::RetainedRef(this)));
 }
 
 void PasswordStore::AddLoginInternal(const PasswordForm& form) {