mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

crypto/apple_keychain_ios.mm

 // 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.
 
 #include "crypto/apple_keychain.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 108 matching lines @@
 }
 
 OSStatus AppleKeychain::AddGenericPassword(SecKeychainRef keychain,
                                            UInt32 serviceNameLength,
                                            const char* serviceName,
                                            UInt32 accountNameLength,
                                            const char* accountName,
                                            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,
                            accountName,
                            passwordLength,
                            passwordData,
                            kKeychainActionCreate));
     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,
                            accountName,
                            passwordLength,
                            passwordData,
                            kKeychainActionUpdate));
     status = SecItemUpdate(query, keychain_data);
   }
 
   return status;
 }
 
 OSStatus AppleKeychain::FindGenericPassword(CFTypeRef keychainOrArray,
                                             UInt32 serviceNameLength,
                                             const char* serviceName,
                                             UInt32 accountNameLength,
                                             const char* accountName,
                                             UInt32* passwordLength,
                                             void** passwordData,
                                             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) {
       *passwordData = NULL;
       *passwordLength = 0;
     }
     return status;
   }
 
   if (passwordData) {
     CFDataRef data = base::mac::CFCast<CFDataRef>(result);
     NSUInteger length = CFDataGetLength(data);
     *passwordData = malloc(length * sizeof(UInt8));
     CFDataGetBytes(data, CFRangeMake(0, length), (UInt8*)*passwordData);
     *passwordLength = length;
   }
   return status;
 }
 
 }  // namespace crypto