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

net/base/cert_test_util.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/cert_test_util.h"
 
 #include "build/build_config.h"
 
 #if defined(USE_OPENSSL)
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
 #include "net/base/openssl_util.h"
 #elif defined(USE_NSS)
 #include <cert.h>
 #include "base/nss_util.h"
 #elif defined(OS_MACOSX)
 #include <Security/Security.h>
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #endif
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "net/base/x509_certificate.h"
 
 namespace net {
 
 #if defined(USE_OPENSSL)
@@ skipping 68 matching lines @@
   if (!file_util::ReadFileToString(filename, &rawcert)) {
     LOG(ERROR) << "Can't load certificate " << filename.value();
     return NULL;
   }
 
   CFDataRef pem = CFDataCreate(kCFAllocatorDefault,
                                reinterpret_cast<const UInt8*>(rawcert.data()),
                                static_cast<CFIndex>(rawcert.size()));
   if (!pem)
     return NULL;
-  scoped_cftyperef<CFDataRef> scoped_pem(pem);
+  base::mac::ScopedCFTypeRef<CFDataRef> scoped_pem(pem);
 
   SecExternalFormat input_format = kSecFormatUnknown;
   SecExternalItemType item_type = kSecItemTypeUnknown;
   CFArrayRef cert_array = NULL;
   if (SecKeychainItemImport(pem, NULL, &input_format, &item_type, 0, NULL, NULL,
                             &cert_array))
     return NULL;
-  scoped_cftyperef<CFArrayRef> scoped_cert_array(cert_array);
+  base::mac::ScopedCFTypeRef<CFArrayRef> scoped_cert_array(cert_array);
 
   if (!CFArrayGetCount(cert_array))
     return NULL;
 
   SecCertificateRef cert_ref = static_cast<SecCertificateRef>(
       const_cast<void*>(CFArrayGetValueAtIndex(cert_array, 0)));
 
   return X509Certificate::CreateFromHandle(cert_ref,
       X509Certificate::SOURCE_LONE_CERT_IMPORT,
       X509Certificate::OSCertHandles());
 }
 #endif
 
 }  // namespace net