Implement origin-based deletion for password manager's auto-signin bit.

chrome/browser/password_manager/password_store_mac.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager/password_store_mac.h"
 
 #include <CoreServices/CoreServices.h>
 #include <stddef.h>
 #include <set>
 #include <string>
@@ skipping 1178 matching lines @@
                                                  &forms_to_remove) &&
       login_metadata_db_->RemoveLoginsSyncedBetween(delete_begin, delete_end)) {
     RemoveKeychainForms(forms_to_remove.get());
     CleanOrphanedForms(&forms_to_remove);  // Add the orphaned forms_to_remove.
     changes = FormsToRemoveChangeList(forms_to_remove.get());
     LogStatsForBulkDeletionDuringRollback(changes.size());
   }
   return changes;
 }
 
-PasswordStoreChangeList PasswordStoreMac::DisableAutoSignInForAllLoginsImpl() {
-  ScopedVector<PasswordForm> forms;
-  PasswordStoreChangeList list;
-  if (login_metadata_db_ && login_metadata_db_->GetAutoSignInLogins(&forms) &&
-      login_metadata_db_->DisableAutoSignInForAllLogins()) {
-    for (const auto& form : forms)
-      list.push_back(PasswordStoreChange(PasswordStoreChange::UPDATE, *form));
+PasswordStoreChangeList PasswordStoreMac::DisableAutoSignInForOriginsImpl(
+    const base::Callback<bool(const GURL&)>& origin_filter) {
+  ScopedVector<autofill::PasswordForm> forms;
+  PasswordStoreChangeList changes;
+  if (!login_metadata_db_ ||
+      !login_metadata_db_->GetAutoSignInLogins(&forms)) {
+    return changes;
   }
 
-  return list;
+  std::set<GURL> origins_to_update;
+  for (const auto* form : forms) {
+    if (origin_filter.Run(form->origin))
+      origins_to_update.insert(form->origin);
+  }
+
+  std::set<GURL> origins_updated;
+  for (const GURL& origin : origins_to_update) {
+    if (login_metadata_db_->DisableAutoSignInForOrigin(origin))
+      origins_updated.insert(origin);
+  }
+
+  for (const auto* form : forms) {
+    if (origins_updated.count(form->origin)) {
+      changes.push_back(
+          PasswordStoreChange(PasswordStoreChange::UPDATE, *form));
+    }
+  }
+
+  return changes;
 }
 
 bool PasswordStoreMac::RemoveStatisticsCreatedBetweenImpl(
     base::Time delete_begin,
     base::Time delete_end) {
   return login_metadata_db_ &&
          login_metadata_db_->stats_table().RemoveStatsBetween(delete_begin,
                                                               delete_end);
 }
 
@@ skipping 158 matching lines @@
   ScopedVector<PasswordForm> forms_with_keychain_entry;
   internal_keychain_helpers::GetPasswordsForForms(*keychain_, &database_forms,
                                                   &forms_with_keychain_entry);
 
   // Clean up any orphaned database entries.
   RemoveDatabaseForms(&database_forms);
 
   // Move the orphaned DB forms to the output parameter.
   AppendSecondToFirst(orphaned_forms, &database_forms);
 }