diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
| commit | df0ca6c858762b101bf424ff6c0522409fa195fc (patch) | |
| tree | efa188eee6972e2c0de358f2d19a2348ce6dcb06 /net/socket/ssl_client_socket_mac.cc | |
| parent | 73de26a684944782a92f8e6840e1b290c9a424cd (diff) | |
| download | chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.zip chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.gz chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.bz2 | |
Move scoped_cftyperef from base to base/mac, use the new namespace, and name it
properly (scoped_cftyperef -> ScopedCFTypeRef).
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3855001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_mac.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_mac.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc index 9a60907..918b6b8 100644 --- a/net/socket/ssl_client_socket_mac.cc +++ b/net/socket/ssl_client_socket_mac.cc @@ -9,7 +9,7 @@ #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" @@ -413,7 +413,7 @@ X509Certificate* GetServerCert(SSLContextRef ssl_context) { // 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); @@ -1042,7 +1042,7 @@ 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); |