Remove stl_util's STLDeleteContainerPairSecondPointers.

chrome/browser/password_manager/password_store_mac_internal.h

 // 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.
 
 #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 73 matching lines @@
       autofill::PasswordForm::Scheme scheme,
       const char* path,
       const char* username);
 
   // Returns the Keychain SecAuthenticationType type corresponding to |scheme|.
   SecAuthenticationType AuthTypeForScheme(
       autofill::PasswordForm::Scheme scheme);
 
   // Changes the password for keychain_item to |password|; returns true if the
   // password was successfully changed.
-  bool SetKeychainItemPassword(const SecKeychainItemRef& keychain_item,
+  bool SetKeychainItemPassword(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,
+  bool SetKeychainItemCreatorCode(SecKeychainItemRef keychain_item,
                                   OSType creator_code);
 
   // Returns the creator code to be used for a Keychain search, depending on
   // whether this object was instructed to search only for items it created.
   // If searches should be restricted in this way, the application-specific
   // creator code will be returned. Otherwise, 0 will be returned, indicating
   // a search of all items, regardless of creator.
   OSType CreatorCodeForSearch();
 
   const AppleKeychain* 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 {
 
 // Pair of pointers to a SecKeychainItemRef and a corresponding PasswordForm.
-typedef std::pair<SecKeychainItemRef*, autofill::PasswordForm*> ItemFormPair;
+typedef std::pair<SecKeychainItemRef, std::unique_ptr<autofill::PasswordForm>>
+    ItemFormPair;
 
 // 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. If
 // |extract_password_data| is true, the password data will be copied from
 // |keychain_item| in addition to its attributes, and the |blacklisted_by_user|
 // field will be set to true for empty passwords ("" or " ").
 // If |extract_password_data| is false, only the password attributes will be
 // copied, and the |blacklisted_by_user| field will always be false.
 //
 // IMPORTANT: If |extract_password_data| is true, 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 intially call this
 // function with |extract_password_data| set to false, and retrieve the password
 // later (accessing other fields doesn't require authorization).
 bool FillPasswordFormFromKeychainItem(const AppleKeychain& keychain,
-                                      const SecKeychainItemRef& keychain_item,
+                                      SecKeychainItemRef keychain_item,
                                       autofill::PasswordForm* form,
                                       bool extract_password_data);
 
 // Returns true if |keychain_item| has the application-specific creator code in
 // its attributes.
 bool HasCreatorCode(const AppleKeychain& keychain,
-                    const SecKeychainItemRef& keychain_item);
+                    SecKeychainItemRef keychain_item);
 
 // Use FormMatchStrictness to configure which forms are considered a match by
 // FormsMatchForMerge:
 enum FormMatchStrictness {
   STRICT_FORM_MATCH,  // Match only forms with the same scheme, signon realm and
                       // username value.
   FUZZY_FORM_MATCH,   // Also match cases where the first form's
                       // original_signon_realm is nonempty and matches the
                       // second form's signon_realm.
 };
@@ skipping 56 matching lines @@
 // Returns PasswordForm instances populated with password data for each keychain
 // entry in |item_form_pairs| that could be merged with |query_form|.
 ScopedVector<autofill::PasswordForm> ExtractPasswordsMergeableWithForm(
     const AppleKeychain& keychain,
     const std::vector<ItemFormPair>& item_form_pairs,
     const autofill::PasswordForm& query_form);
 
 }  // namespace internal_keychain_helpers
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_INTERNAL_H_