Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

net/base/keygen_handler_mac.cc

 // Copyright (c) 2010 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 "net/base/keygen_handler.h"
 
 #include <Security/SecAsn1Coder.h>
 #include <Security/SecAsn1Templates.h>
 #include <Security/Security.h>
 
 #include "base/base64.h"
 #include "base/crypto/cssm_init.h"
 #include "base/lock.h"
 #include "base/logging.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 
 // These are in Security.framework but not declared in a public header.
 extern const SecAsn1Template kSecAsn1AlgorithmIDTemplate[];
 extern const SecAsn1Template kSecAsn1SubjectPublicKeyInfoTemplate[];
 
 namespace net {
 
 // Declarations of Netscape keygen cert structures for ASN.1 encoding:
@@ skipping 78 matching lines @@
   SecAccessRef initial_access = NULL;
   SecKeyRef public_key = NULL;
   SecKeyRef private_key = NULL;
   SecAsn1CoderRef coder = NULL;
   CSSM_DATA signature = {0, NULL};
 
   {
     if (url_.has_host()) {
       // TODO(davidben): Use something like "Key generated for
       // example.com", but localize it.
-      scoped_cftyperef<CFStringRef> label(
+      base::mac::ScopedCFTypeRef<CFStringRef> label(
           base::SysUTF8ToCFStringRef(url_.host()));
       // Create an initial access object to set the SecAccessRef. This
       // sets a label on the Keychain dialogs. Pass NULL as the second
       // argument to use the default trusted list; only allow the
       // current application to access without user confirmation.
       err = SecAccessCreate(label, NULL, &initial_access);
       // If we fail, just continue without a label.
       if (err)
         base::LogCSSMError("SecAccessCreate", err);
     }
 
     // Create the key-pair.
     err = CreateRSAKeyPair(key_size_in_bits_, initial_access,
                            &public_key, &private_key);
     if (err)
       goto failure;
 
     // Get the public key data (DER sequence of modulus, exponent).
     CFDataRef key_data = NULL;
     err = SecKeychainItemExport(public_key, kSecFormatBSAFE, 0, NULL,
                                 &key_data);
     if (err) {
       base::LogCSSMError("SecKeychainItemExpor", err);
       goto failure;
     }
-    scoped_cftyperef<CFDataRef> scoped_key_data(key_data);
+    base::mac::ScopedCFTypeRef<CFDataRef> scoped_key_data(key_data);
 
     // Create an ASN.1 encoder.
     err = SecAsn1CoderCreate(&coder);
     if (err) {
       base::LogCSSMError("SecAsn1CoderCreate", err);
       goto failure;
     }
 
     // Fill in and DER-encode the PublicKeyAndChallenge:
     SignedPublicKeyAndChallenge spkac;
@@ skipping 74 matching lines @@
                                  SecAccessRef initial_access,
                                  SecKeyRef* out_pub_key,
                                  SecKeyRef* out_priv_key) {
   OSStatus err;
   SecKeychainRef keychain;
   err = SecKeychainCopyDefault(&keychain);
   if (err) {
     base::LogCSSMError("SecKeychainCopyDefault", err);
     return err;
   }
-  scoped_cftyperef<SecKeychainRef> scoped_keychain(keychain);
+  base::mac::ScopedCFTypeRef<SecKeychainRef> scoped_keychain(keychain);
   {
     AutoLock locked(base::GetMacSecurityServicesLock());
     err = SecKeyCreatePair(
         keychain,
         CSSM_ALGID_RSA,
         size_in_bits,
         0LL,
         // public key usage and attributes:
         CSSM_KEYUSE_ENCRYPT | CSSM_KEYUSE_VERIFY | CSSM_KEYUSE_WRAP,
         CSSM_KEYATTR_EXTRACTABLE | CSSM_KEYATTR_PERMANENT,
@@ skipping 68 matching lines @@
     return err;
   }
   err = CSSM_SignData(cc_handle, &data, 1, CSSM_ALGID_NONE, signature);
   if (err)
     base::LogCSSMError("CSSM_SignData", err);
   CSSM_DeleteContext(cc_handle);
   return err;
 }
 
 }  // namespace net