diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:49:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:49:05 +0000 |
| commit | 3df79f4277938356ae3c7b3ecc25ab6165e8a899 (patch) | |
| tree | a1a39cd236c8800a13f2f3bf879d69505a2508de /crypto | |
| parent | 8a15ea13737ae2f8444424fc14d1fcd5e42d5218 (diff) | |
| download | chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.zip chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.gz chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.bz2 | |
mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.
This CL was created fully mechanically by running
git grep -l base::mac::ScopedCFTypeRef | xargs sed -i -e 's/base::mac::ScopedCFTypeRef/base::ScopedCFTypeRef/g'
git commit -a -m.
git clang-format HEAD^ --style=Chromium
git commit -a -m.
git cl upload -t $TITLE
BUG=251957
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/16917011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/apple_keychain_ios.mm | 20 | ||||
| -rw-r--r-- | crypto/cssm_init.cc | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/crypto/apple_keychain_ios.mm b/crypto/apple_keychain_ios.mm index 1a4c9d5..c0b1048 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) { diff --git a/crypto/cssm_init.cc b/crypto/cssm_init.cc index 7b7e52d..208309c 100644 --- a/crypto/cssm_init.cc +++ b/crypto/cssm_init.cc @@ -184,7 +184,7 @@ void CSSMFree(void* ptr) { void LogCSSMError(const char* fn_name, CSSM_RETURN err) { if (!err) return; - base::mac::ScopedCFTypeRef<CFStringRef> cfstr( + base::ScopedCFTypeRef<CFStringRef> cfstr( SecCopyErrorMessageString(err, NULL)); LOG(ERROR) << fn_name << " returned " << err << " (" << base::SysCFStringRefToUTF8(cfstr) << ")"; |