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

net/socket/ssl_client_socket_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/socket/ssl_client_socket_mac.h"
 
 #include <CoreServices/CoreServices.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "net/base/address_list.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/ssl_info.h"
@@ skipping 383 matching lines @@
 // Returns the server's certificate.  The caller must release a reference
 // to the return value when done.  Returns NULL on failure.
 X509Certificate* GetServerCert(SSLContextRef ssl_context) {
   CFArrayRef certs;
   OSStatus status = SSLCopyPeerCertificates(ssl_context, &certs);
   // SSLCopyPeerCertificates may succeed but return a null |certs|
   // (if we're using an anonymous cipher suite or if we call it
   // before the certificate message has arrived and been parsed).
   if (status != noErr || !certs)
     return NULL;
-  scoped_cftyperef<CFArrayRef> scoped_certs(certs);
+  base::mac::ScopedCFTypeRef<CFArrayRef> scoped_certs(certs);
 
   DCHECK_GT(CFArrayGetCount(certs), 0);
 
   // Add each of the intermediate certificates in the server's chain to the
   // server's X509Certificate object. This makes them available to
   // X509Certificate::Verify() for chain building.
   std::vector<SecCertificateRef> intermediate_ca_certs;
   CFIndex certs_length = CFArrayGetCount(certs);
   for (CFIndex i = 1; i < certs_length; ++i) {
     SecCertificateRef cert_ref = reinterpret_cast<SecCertificateRef>(
@@ skipping 608 matching lines @@
   // The initial handshake has completed.
   next_handshake_state_ = STATE_COMPLETED_HANDSHAKE;
 
   return result;
 }
 
 int SSLClientSocketMac::SetClientCert() {
   if (!ssl_config_.send_client_cert || !ssl_config_.client_cert)
     return noErr;
 
-  scoped_cftyperef<CFArrayRef> cert_refs(
+  base::mac::ScopedCFTypeRef<CFArrayRef> cert_refs(
       ssl_config_.client_cert->CreateClientCertificateChain());
   VLOG(1) << "SSLSetCertificate(" << CFArrayGetCount(cert_refs) << " certs)";
   OSStatus result = SSLSetCertificate(ssl_context_, cert_refs);
   if (result)
     LOG(ERROR) << "SSLSetCertificate returned OSStatus " << result;
   return result;
 }
 
 int SSLClientSocketMac::DoPayloadRead() {
   size_t processed = 0;
@@ skipping 205 matching lines @@
   if (rv < 0 && rv != ERR_IO_PENDING) {
     us->write_io_buf_ = NULL;
     return OSStatusFromNetError(rv);
   }
 
   // always lie to our caller
   return noErr;
 }
 
 }  // namespace net