| Index: chrome/browser/mock_keychain_mac.h
|
| diff --git a/chrome/browser/mock_keychain_mac.h b/chrome/browser/mock_keychain_mac.h
|
| index f614cef344396c8f862b3aeaf1d295d6143f4848..662a524e05edd3738ed75ee8820726174aa6f95b 100644
|
| --- a/chrome/browser/mock_keychain_mac.h
|
| +++ b/chrome/browser/mock_keychain_mac.h
|
| @@ -10,6 +10,7 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/compiler_specific.h"
|
| #include "chrome/browser/keychain_mac.h"
|
|
|
| // Mock Keychain wrapper for testing code that interacts with the OS Keychain.
|
| @@ -28,55 +29,58 @@ class MockKeychain : public MacKeychain {
|
| virtual OSStatus ItemCopyAttributesAndData(
|
| SecKeychainItemRef itemRef, SecKeychainAttributeInfo *info,
|
| SecItemClass *itemClass, SecKeychainAttributeList **attrList,
|
| - UInt32 *length, void **outData) const;
|
| + UInt32 *length, void **outData) const OVERRIDE;
|
| // Pass "fail_me" as the data to get errSecAuthFailed.
|
| virtual OSStatus ItemModifyAttributesAndData(
|
| SecKeychainItemRef itemRef, const SecKeychainAttributeList *attrList,
|
| - UInt32 length, const void *data) const;
|
| + UInt32 length, const void *data) const OVERRIDE;
|
| virtual OSStatus ItemFreeAttributesAndData(SecKeychainAttributeList *attrList,
|
| - void *data) const;
|
| - virtual OSStatus ItemDelete(SecKeychainItemRef itemRef) const;
|
| + void *data) const OVERRIDE;
|
| + virtual OSStatus ItemDelete(SecKeychainItemRef itemRef) const OVERRIDE;
|
| virtual OSStatus SearchCreateFromAttributes(
|
| CFTypeRef keychainOrArray, SecItemClass itemClass,
|
| const SecKeychainAttributeList *attrList,
|
| - SecKeychainSearchRef *searchRef) const;
|
| + SecKeychainSearchRef *searchRef) const OVERRIDE;
|
| virtual OSStatus SearchCopyNext(SecKeychainSearchRef searchRef,
|
| - SecKeychainItemRef *itemRef) const;
|
| + SecKeychainItemRef *itemRef) const OVERRIDE;
|
| // If there are unused slots in the Mock Keychain's capacity, the new item
|
| // will use the first free one, otherwise it will stomp the last item.
|
| // Pass "some.domain.com" as the serverName to get errSecDuplicateItem.
|
| - virtual OSStatus AddInternetPassword(SecKeychainRef keychain,
|
| - UInt32 serverNameLength,
|
| - const char *serverName,
|
| - UInt32 securityDomainLength,
|
| - const char *securityDomain,
|
| - UInt32 accountNameLength,
|
| - const char *accountName,
|
| - UInt32 pathLength, const char *path,
|
| - UInt16 port, SecProtocolType protocol,
|
| - SecAuthenticationType authenticationType,
|
| - UInt32 passwordLength,
|
| - const void *passwordData,
|
| - SecKeychainItemRef *itemRef) const;
|
| - virtual OSStatus FindGenericPassword(CFTypeRef keychainOrArray,
|
| - UInt32 serviceNameLength,
|
| - const char *serviceName,
|
| - UInt32 accountNameLength,
|
| - const char *accountName,
|
| - UInt32 *passwordLength,
|
| - void **passwordData,
|
| - SecKeychainItemRef *itemRef) const;
|
| + virtual OSStatus AddInternetPassword(
|
| + SecKeychainRef keychain,
|
| + UInt32 serverNameLength,
|
| + const char *serverName,
|
| + UInt32 securityDomainLength,
|
| + const char *securityDomain,
|
| + UInt32 accountNameLength,
|
| + const char *accountName,
|
| + UInt32 pathLength, const char *path,
|
| + UInt16 port, SecProtocolType protocol,
|
| + SecAuthenticationType authenticationType,
|
| + UInt32 passwordLength,
|
| + const void *passwordData,
|
| + SecKeychainItemRef *itemRef) const OVERRIDE;
|
| + virtual OSStatus FindGenericPassword(
|
| + CFTypeRef keychainOrArray,
|
| + UInt32 serviceNameLength,
|
| + const char *serviceName,
|
| + UInt32 accountNameLength,
|
| + const char *accountName,
|
| + UInt32 *passwordLength,
|
| + void **passwordData,
|
| + SecKeychainItemRef *itemRef) const OVERRIDE;
|
| virtual OSStatus ItemFreeContent(SecKeychainAttributeList *attrList,
|
| - void *data) const;
|
| - virtual OSStatus AddGenericPassword(SecKeychainRef keychain,
|
| - UInt32 serviceNameLength,
|
| - const char *serviceName,
|
| - UInt32 accountNameLength,
|
| - const char *accountName,
|
| - UInt32 passwordLength,
|
| - const void *passwordData,
|
| - SecKeychainItemRef *itemRef) const;
|
| - virtual void Free(CFTypeRef ref) const;
|
| + void *data) const OVERRIDE;
|
| + virtual OSStatus AddGenericPassword(
|
| + SecKeychainRef keychain,
|
| + UInt32 serviceNameLength,
|
| + const char *serviceName,
|
| + UInt32 accountNameLength,
|
| + const char *accountName,
|
| + UInt32 passwordLength,
|
| + const void *passwordData,
|
| + SecKeychainItemRef *itemRef) const OVERRIDE;
|
| + virtual void Free(CFTypeRef ref) const OVERRIDE;
|
|
|
| // Return the counts of objects returned by Create/Copy functions but never
|
| // Free'd as they should have been.
|
|
|