Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*"

OS X fixes and post-Linux cleanup

BUG=110610
TBR=darin

Review URL: https://codereview.chromium.org/16402003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206189 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 15 deletions

diff --git a/net/ssl/client_cert_store_impl_mac.cc b/net/ssl/client_cert_store_impl_mac.cc
index ecc707e..5fa42de 100644
--- a/net/ssl/client_cert_store_impl_mac.cc
+++ b/net/ssl/client_cert_store_impl_mac.cc
@@ -83,7 +83,7 @@ OSStatus CopyCertChain(SecCertificateRef cert_handle,
 bool IsIssuedByInKeychain(const std::vector<std::string>& valid_issuers,
                           scoped_refptr<X509Certificate>* cert) {
   DCHECK(cert);
-  DCHECK(*cert);
+  DCHECK(cert->get());
 
   X509Certificate::OSCertHandle cert_handle = (*cert)->os_cert_handle();
   CFArrayRef cert_chain = NULL;
@@ -128,7 +128,7 @@ bool GetClientCertsImpl(const scoped_refptr<X509Certificate>& preferred_cert,
                         bool query_keychain,
                         CertificateList* selected_certs) {
   CertificateList preliminary_list;
-  if (preferred_cert)
+  if (preferred_cert.get())
     preliminary_list.push_back(preferred_cert);
   preliminary_list.insert(preliminary_list.end(), regular_certs.begin(),
                           regular_certs.end());
@@ -162,9 +162,8 @@ bool GetClientCertsImpl(const scoped_refptr<X509Certificate>& preferred_cert,
   // sorting.
   CertificateList::iterator sort_begin = selected_certs->begin();
   CertificateList::iterator sort_end = selected_certs->end();
-  if (preferred_cert &&
-      sort_begin != sort_end &&
-      *sort_begin == preferred_cert) {
+  if (preferred_cert.get() && sort_begin != sort_end &&
+      sort_begin->get() == preferred_cert.get()) {
     ++sort_begin;
   }
   sort(sort_begin, sort_end, x509_util::ClientCertSorter());
@@ -231,7 +230,7 @@ bool ClientCertStoreImpl::GetClientCerts(const SSLCertRequestInfo& request,
 
     if (preferred_identity && CFEqual(preferred_identity, identity)) {
       // Only one certificate should match.
-      DCHECK(!preferred_cert);
+      DCHECK(!preferred_cert.get());
       preferred_cert = cert;
     } else {
       regular_certs.push_back(cert);
diff --git a/net/ssl/client_cert_store_impl_unittest.cc b/net/ssl/client_cert_store_impl_unittest.cc
index 7b05ef2..500e156 100644
--- a/net/ssl/client_cert_store_impl_unittest.cc
+++ b/net/ssl/client_cert_store_impl_unittest.cc
@@ -124,7 +124,7 @@ TEST_F(ClientCertStoreImplTest, CertAuthorityFiltering) {
 TEST_F(ClientCertStoreImplTest, FilterOutThePreferredCert) {
   scoped_refptr<X509Certificate> cert_1(
       ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem"));
-  ASSERT_TRUE(cert_1);
+  ASSERT_TRUE(cert_1.get());
 
   std::vector<std::string> authority_2(
       1, std::string(reinterpret_cast<const char*>(kAuthority2DN),
@@ -136,8 +136,8 @@ TEST_F(ClientCertStoreImplTest, FilterOutThePreferredCert) {
   request->cert_authorities = authority_2;
 
   std::vector<scoped_refptr<X509Certificate> > selected_certs;
-  bool rv =
-      SelectClientCertsGivenPreferred(cert_1, certs, *request, &selected_certs);
+  bool rv = SelectClientCertsGivenPreferred(
+      cert_1, certs, *request.get(), &selected_certs);
   EXPECT_TRUE(rv);
   EXPECT_EQ(0u, selected_certs.size());
 }
@@ -147,22 +147,22 @@ TEST_F(ClientCertStoreImplTest, FilterOutThePreferredCert) {
 TEST_F(ClientCertStoreImplTest, PreferredCertGoesFirst) {
   scoped_refptr<X509Certificate> cert_1(
       ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem"));
-  ASSERT_TRUE(cert_1);
+  ASSERT_TRUE(cert_1.get());
   scoped_refptr<X509Certificate> cert_2(
       ImportCertFromFile(GetTestCertsDirectory(), "client_2.pem"));
-  ASSERT_TRUE(cert_2);
+  ASSERT_TRUE(cert_2.get());
 
   std::vector<scoped_refptr<X509Certificate> > certs;
   certs.push_back(cert_2);
   scoped_refptr<SSLCertRequestInfo> request(new SSLCertRequestInfo());
 
   std::vector<scoped_refptr<X509Certificate> > selected_certs;
-  bool rv =
-      SelectClientCertsGivenPreferred(cert_1, certs, *request, &selected_certs);
+  bool rv = SelectClientCertsGivenPreferred(
+      cert_1, certs, *request.get(), &selected_certs);
   EXPECT_TRUE(rv);
   ASSERT_EQ(2u, selected_certs.size());
-  EXPECT_TRUE(selected_certs[0]->Equals(cert_1));
-  EXPECT_TRUE(selected_certs[1]->Equals(cert_2));
+  EXPECT_TRUE(selected_certs[0]->Equals(cert_1.get()));
+  EXPECT_TRUE(selected_certs[1]->Equals(cert_2.get()));
 }
 #endif