PasswordForm -> FormDigest for GetLogins

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 1218 matching lines @@
 
 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);
 }
 
 ScopedVector<autofill::PasswordForm> PasswordStoreMac::FillMatchingLogins(
-    const autofill::PasswordForm& form) {
+    const FormDigest& form) {
   chrome::ScopedSecKeychainSetUserInteractionAllowed user_interaction_allowed(
       false);
 
   ScopedVector<PasswordForm> database_forms;
   if (!login_metadata_db_ ||
       !login_metadata_db_->GetLogins(form, &database_forms)) {
     return ScopedVector<autofill::PasswordForm>();
   }
 
   // Let's gather all signon realms we want to match with keychain entries.
@@ skipping 88 matching lines @@
     return true;
   MacKeychainPasswordFormAdapter keychainAdapter(keychain_.get());
   return keychainAdapter.AddPassword(form);
 }
 
 bool PasswordStoreMac::DatabaseHasFormMatchingKeychainForm(
     const autofill::PasswordForm& form) {
   DCHECK(login_metadata_db_);
   bool has_match = false;
   ScopedVector<autofill::PasswordForm> database_forms;
-  if (!login_metadata_db_->GetLogins(form, &database_forms))
+  if (!login_metadata_db_->GetLogins(
+          password_manager::PasswordStore::FormDigest(form), &database_forms))
     return false;
   for (const autofill::PasswordForm* db_form : database_forms) {
     // Below we filter out fuzzy matched forms because we are only interested
     // in exact ones.
     if (!db_form->is_public_suffix_match &&
         internal_keychain_helpers::FormsMatchForMerge(
             form, *db_form, internal_keychain_helpers::STRICT_FORM_MATCH) &&
         db_form->origin == form.origin) {
       has_match = true;
       break;
@@ skipping 37 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);
 }