Index: crypto/apple_keychain_ios.mm |
diff --git a/crypto/apple_keychain_ios.mm b/crypto/apple_keychain_ios.mm |
index 1a4c9d5442f9808c0205166323ee0a0296e221e5..c0b104868a20f2c28b816ac174d39fee38a717e5 100644 |
--- a/crypto/apple_keychain_ios.mm |
+++ b/crypto/apple_keychain_ios.mm |
@@ -126,16 +126,13 @@ OSStatus AppleKeychain::AddGenericPassword(SecKeychainRef keychain, |
UInt32 passwordLength, |
const void* passwordData, |
SecKeychainItemRef* itemRef) const { |
- base::mac::ScopedCFTypeRef<CFDictionaryRef> query( |
- CreateGenericPasswordQuery(serviceNameLength, |
- serviceName, |
- accountNameLength, |
- accountName)); |
+ base::ScopedCFTypeRef<CFDictionaryRef> query(CreateGenericPasswordQuery( |
+ serviceNameLength, serviceName, accountNameLength, accountName)); |
// Check that there is not already a password. |
OSStatus status = SecItemCopyMatching(query, NULL); |
if (status == errSecItemNotFound) { |
// A new entry must be created. |
- base::mac::ScopedCFTypeRef<CFDictionaryRef> keychain_data( |
+ base::ScopedCFTypeRef<CFDictionaryRef> keychain_data( |
CreateKeychainData(serviceNameLength, |
serviceName, |
accountNameLength, |
@@ -146,7 +143,7 @@ OSStatus AppleKeychain::AddGenericPassword(SecKeychainRef keychain, |
status = SecItemAdd(keychain_data, NULL); |
} else if (status == noErr) { |
// The entry must be updated. |
- base::mac::ScopedCFTypeRef<CFDictionaryRef> keychain_data( |
+ base::ScopedCFTypeRef<CFDictionaryRef> keychain_data( |
CreateKeychainData(serviceNameLength, |
serviceName, |
accountNameLength, |
@@ -170,16 +167,13 @@ OSStatus AppleKeychain::FindGenericPassword(CFTypeRef keychainOrArray, |
SecKeychainItemRef* itemRef) const { |
DCHECK((passwordData && passwordLength) || |
(!passwordData && !passwordLength)); |
- base::mac::ScopedCFTypeRef<CFDictionaryRef> query( |
- CreateGenericPasswordQuery(serviceNameLength, |
- serviceName, |
- accountNameLength, |
- accountName)); |
+ base::ScopedCFTypeRef<CFDictionaryRef> query(CreateGenericPasswordQuery( |
+ serviceNameLength, serviceName, accountNameLength, accountName)); |
// Get the keychain item containing the password. |
CFTypeRef resultRef = NULL; |
OSStatus status = SecItemCopyMatching(query, &resultRef); |
- base::mac::ScopedCFTypeRef<CFTypeRef> result(resultRef); |
+ base::ScopedCFTypeRef<CFTypeRef> result(resultRef); |
if (status != noErr) { |
if (passwordData) { |