Support individual Keychain item deletion

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 19 matching lines @@
   // 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);
 
   // 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 AddLogin(const webkit_glue::PasswordForm& form);
+  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.
+  bool RemovePassword(const webkit_glue::PasswordForm& form);
+
+  // Controls whether or not Chrome will restrict Keychain searches to items
+  // that it created. Defaults to false.
+  void SetFindsOnlyOwnedItems(bool finds_only_owned);
 
  private:
   // Returns PasswordForms constructed from the given Keychain items.
   // Caller is responsible for deleting the returned forms.
   std::vector<webkit_glue::PasswordForm*> CreateFormsFromKeychainItems(
       const std::vector<SecKeychainItemRef>& items);
 
   // Searches |keychain| for all items usable for the given form, and returns
   // them. The caller is responsible for calling MacKeychain::Free on the
   // returned items.
   std::vector<SecKeychainItemRef> KeychainItemsForFillingForm(
       const webkit_glue::PasswordForm& form);
 
   // Searches |keychain| for the specific keychain entry that corresponds to the
-  // given form, and returns it (or NULL if no match is found).  The caller is
+  // given form, and returns it (or NULL if no match is found). The caller is
   // responsible for calling MacKeychain::Free on on the returned item.
   SecKeychainItemRef KeychainItemForForm(
       const webkit_glue::PasswordForm& form);
 
   // Returns the Keychain items matching the given signon_realm, scheme, and
   // optionally path and username (either of both can be NULL).
-  // them. The caller is responsible for calling MacKeychain::Free on the
+  // The caller is responsible for calling MacKeychain::Free on the
   // returned items.
   std::vector<SecKeychainItemRef> MatchingKeychainItems(
       const std::string& signon_realm, webkit_glue::PasswordForm::Scheme scheme,
       const char* path, const char* username);
 
   // Takes a PasswordForm's signon_realm and parses it into its component parts,
   // which are returned though the appropriate out parameters.
   // Returns true if it can be successfully parsed, in which case all out params
   // that are non-NULL will be set. If there is no port, port will be 0.
   // If the return value is false, the state of the out params is undefined.
@@ skipping 11 matching lines @@
   bool SetKeychainItemPassword(const SecKeychainItemRef& keychain_item,
                                const std::string& password);
 
   // Sets the creator code of keychain_item to creator_code; returns true if the
   // creator code was successfully set.
   bool SetKeychainItemCreatorCode(const SecKeychainItemRef& keychain_item,
                                   OSType creator_code);
 
   MacKeychain* keychain_;
 
+  // If true, Keychain searches are restricted to items created by Chrome.
+  bool finds_only_owned_;
+
   DISALLOW_COPY_AND_ASSIGN(MacKeychainPasswordFormAdapter);
 };
 
 namespace internal_keychain_helpers {
 
 // Sets the fields of |form| based on the keychain data from |keychain_item|.
 // Fields that can't be determined from |keychain_item| will be unchanged.
 //
 // IMPORTANT: This function can cause the OS to trigger UI (to allow access to
 // the keychain item if we aren't trusted for the item), and block until the UI
 // is dismissed.
 //
 // If excessive prompting for access to other applications' keychain items
 // becomes an issue, the password storage API will need to be refactored to
 // allow the password to be retrieved later (accessing other fields doesn't
 // require authorization).
 bool FillPasswordFormFromKeychainItem(const MacKeychain& keychain,
                                       const SecKeychainItemRef& keychain_item,
                                       webkit_glue::PasswordForm* form);
 
 // Returns true if the two given forms match based on signon_reaml, scheme, and
 // username_value, and are thus suitable for merging (see MergePasswordForms).
-// If this returns true, and path_matches is non-NULL, *path_matches will be set
-// based on whether the full origin matches as well.
 bool FormsMatchForMerge(const webkit_glue::PasswordForm& form_a,
-                        const webkit_glue::PasswordForm& form_b,
-                        bool* path_matches);
+                        const webkit_glue::PasswordForm& form_b);
 
 // Populates merged_forms by combining the password data from keychain_forms and
 // the metadata from database_forms, removing used entries from the two source
 // lists.
 //
 // On return, database_forms and keychain_forms will have only unused
 // entries; for database_forms that means entries for which no corresponding
 // password can be found (and which aren't blacklist entries), but for
 // keychain_forms it's only entries we explicitly choose not to use (e.g.,
 // blacklist entries from other browsers). Keychain entries that we have no
 // database matches for will still end up in merged_forms, since they have
 // enough information to be used as imported passwords.
 void MergePasswordForms(std::vector<webkit_glue::PasswordForm*>* keychain_forms,
                         std::vector<webkit_glue::PasswordForm*>* database_forms,
                         std::vector<webkit_glue::PasswordForm*>* merged_forms);
 
 }  // internal_keychain_helpers
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_INTERNAL_H_