Don't re-store deleted passwords on form submit on the Mac

chrome/browser/password_manager/password_store_mac_internal.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_INTERNAL_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_INTERNAL_H_
 
 #include <Security/Security.h>
 
 #include <string>
@@ skipping 22 matching lines @@
   std::vector<webkit_glue::PasswordForm*> PasswordsMergeableWithForm(
       const webkit_glue::PasswordForm& query_form);
 
   // Returns the PasswordForm for the Keychain entry that matches |form| on all
   // of the fields that uniquely identify a Keychain item, or NULL if there is
   // no such entry.
   // Caller is responsible for deleting the returned form.
   webkit_glue::PasswordForm* PasswordExactlyMatchingForm(
       const webkit_glue::PasswordForm& query_form);
 
+  // Returns true if PasswordsMergeableWithForm would return any items. This is
+  // a separate method because calling PasswordsMergeableWithForm and checking
+  // the return count would require reading the passwords from the keychain,
+  // thus potentially triggering authorizaiton UI, whereas this won't.
+  bool HasPasswordsMergeableWithForm(
+      const webkit_glue::PasswordForm& query_form);
+
   // Returns all keychain items of types corresponding to password forms.
   std::vector<webkit_glue::PasswordForm*> GetAllPasswordFormPasswords();
 
   // Creates a new keychain entry from |form|, or updates the password of an
   // existing keychain entry if there is a collision. Returns true if a keychain
   // entry was successfully added/updated.
   bool AddPassword(const webkit_glue::PasswordForm& form);
 
   // Removes the keychain password matching |form| if any. Returns true if a
   // keychain item was found and successfully removed.
@@ skipping 101 matching lines @@
 // Fills in the passwords for as many of the forms in |database_forms| as
 // possible using entries from |keychain| and returns them. On return,
 // |database_forms| will contain only the forms for which no password was found.
 std::vector<webkit_glue::PasswordForm*> GetPasswordsForForms(
     const MacKeychain& keychain,
     std::vector<webkit_glue::PasswordForm*>* database_forms);
 
 }  // internal_keychain_helpers
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_INTERNAL_H_