Remove implicit conversions from scoped_refptr to T* in net/cert/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610

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

Cr-Commit-Position: refs/heads/master@{#291801}

11 files changed, 97 insertions, 86 deletions

diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
index 5327d66..5c1d9077 100644
--- a/net/cert/cert_verify_proc_unittest.cc
+++ b/net/cert/cert_verify_proc_unittest.cc
@@ -199,7 +199,7 @@ TEST_F(CertVerifyProcTest, PaypalNullCertParsing) {
           reinterpret_cast<const char*>(paypal_null_der),
           sizeof(paypal_null_der)));
 
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), paypal_null_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), paypal_null_cert.get());
 
   const SHA1HashValue& fingerprint =
       paypal_null_cert->fingerprint();
@@ -284,11 +284,11 @@ TEST_F(CertVerifyProcTest, DISABLED_GlobalSignR3EVTest) {
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "2029_globalsign_com_cert.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert.get());
 
   scoped_refptr<X509Certificate> intermediate_cert =
       ImportCertFromFile(certs_dir, "globalsign_ev_sha256_ca_cert.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert.get());
 
   X509Certificate::OSCertHandles intermediates;
   intermediates.push_back(intermediate_cert->os_cert_handle());
@@ -368,7 +368,7 @@ TEST_F(CertVerifyProcTest, RejectWeakKeys) {
   // Add the root that signed the intermediates for this test.
   scoped_refptr<X509Certificate> root_cert =
       ImportCertFromFile(certs_dir, "2048-rsa-root.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), root_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), root_cert.get());
   ScopedTestRoot scoped_root(root_cert.get());
 
   // Now test each chain.
@@ -381,12 +381,12 @@ TEST_F(CertVerifyProcTest, RejectWeakKeys) {
       SCOPED_TRACE(basename);
       scoped_refptr<X509Certificate> ee_cert =
           ImportCertFromFile(certs_dir, basename);
-      ASSERT_NE(static_cast<X509Certificate*>(NULL), ee_cert);
+      ASSERT_NE(static_cast<X509Certificate*>(NULL), ee_cert.get());
 
       basename = *signer_type + "-intermediate.pem";
       scoped_refptr<X509Certificate> intermediate =
           ImportCertFromFile(certs_dir, basename);
-      ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate);
+      ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate.get());
 
       X509Certificate::OSCertHandles intermediates;
       intermediates.push_back(intermediate->os_cert_handle());
@@ -480,11 +480,11 @@ TEST_F(CertVerifyProcTest, GoogleDigiNotarTest) {
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "google_diginotar.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert.get());
 
   scoped_refptr<X509Certificate> intermediate_cert =
       ImportCertFromFile(certs_dir, "diginotar_public_ca_2025.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert.get());
 
   X509Certificate::OSCertHandles intermediates;
   intermediates.push_back(intermediate_cert->os_cert_handle());
@@ -555,7 +555,7 @@ TEST_F(CertVerifyProcTest, NameConstraintsOk) {
                                     "root_ca_cert.pem",
                                     X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_cert_list.size());
-  ScopedTestRoot test_root(ca_cert_list[0]);
+  ScopedTestRoot test_root(ca_cert_list[0].get());
 
   CertificateList cert_list = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "name_constraint_ok.crt",
@@ -590,7 +590,7 @@ TEST_F(CertVerifyProcTest, NameConstraintsFailure) {
                                     "root_ca_cert.pem",
                                     X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_cert_list.size());
-  ScopedTestRoot test_root(ca_cert_list[0]);
+  ScopedTestRoot test_root(ca_cert_list[0].get());
 
   CertificateList cert_list = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "name_constraint_bad.crt",
@@ -716,7 +716,7 @@ TEST_F(CertVerifyProcTest, InvalidKeyUsage) {
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "invalid_key_usage_cert.der");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert.get());
 
   int flags = 0;
   CertVerifyResult verify_result;
@@ -770,11 +770,12 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainBasic) {
   scoped_refptr<X509Certificate> google_full_chain =
       X509Certificate::CreateFromHandle(certs[0]->os_cert_handle(),
                                         intermediates);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_full_chain);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_full_chain.get());
   ASSERT_EQ(2U, google_full_chain->GetIntermediateCertificates().size());
 
   CertVerifyResult verify_result;
-  EXPECT_EQ(static_cast<X509Certificate*>(NULL), verify_result.verified_cert);
+  EXPECT_EQ(static_cast<X509Certificate*>(NULL),
+            verify_result.verified_cert.get());
   int error = Verify(google_full_chain.get(),
                      "127.0.0.1",
                      0,
@@ -782,7 +783,8 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainBasic) {
                      empty_cert_list_,
                      &verify_result);
   EXPECT_EQ(OK, error);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), verify_result.verified_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL),
+            verify_result.verified_cert.get());
 
   EXPECT_NE(google_full_chain, verify_result.verified_cert);
   EXPECT_TRUE(X509Certificate::IsSameOSCert(
@@ -858,11 +860,12 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainProperlyOrdered) {
   scoped_refptr<X509Certificate> google_full_chain =
       X509Certificate::CreateFromHandle(certs[0]->os_cert_handle(),
                                         intermediates);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_full_chain);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_full_chain.get());
   ASSERT_EQ(2U, google_full_chain->GetIntermediateCertificates().size());
 
   CertVerifyResult verify_result;
-  EXPECT_EQ(static_cast<X509Certificate*>(NULL), verify_result.verified_cert);
+  EXPECT_EQ(static_cast<X509Certificate*>(NULL),
+            verify_result.verified_cert.get());
   int error = Verify(google_full_chain.get(),
                      "127.0.0.1",
                      0,
@@ -870,7 +873,8 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainProperlyOrdered) {
                      empty_cert_list_,
                      &verify_result);
   EXPECT_EQ(OK, error);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), verify_result.verified_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL),
+            verify_result.verified_cert.get());
 
   EXPECT_NE(google_full_chain, verify_result.verified_cert);
   EXPECT_TRUE(X509Certificate::IsSameOSCert(
@@ -904,8 +908,8 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainFiltersUnrelatedCerts) {
       ImportCertFromFile(certs_dir, "duplicate_cn_1.pem");
   scoped_refptr<X509Certificate> unrelated_certificate2 =
       ImportCertFromFile(certs_dir, "aia-cert.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), unrelated_certificate);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), unrelated_certificate2);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), unrelated_certificate.get());
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), unrelated_certificate2.get());
 
   // Interject unrelated certificates into the list of intermediates.
   X509Certificate::OSCertHandles intermediates;
@@ -917,11 +921,12 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainFiltersUnrelatedCerts) {
   scoped_refptr<X509Certificate> google_full_chain =
       X509Certificate::CreateFromHandle(certs[0]->os_cert_handle(),
                                         intermediates);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_full_chain);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_full_chain.get());
   ASSERT_EQ(4U, google_full_chain->GetIntermediateCertificates().size());
 
   CertVerifyResult verify_result;
-  EXPECT_EQ(static_cast<X509Certificate*>(NULL), verify_result.verified_cert);
+  EXPECT_EQ(static_cast<X509Certificate*>(NULL),
+            verify_result.verified_cert.get());
   int error = Verify(google_full_chain.get(),
                      "127.0.0.1",
                      0,
@@ -929,7 +934,8 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainFiltersUnrelatedCerts) {
                      empty_cert_list_,
                      &verify_result);
   EXPECT_EQ(OK, error);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), verify_result.verified_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL),
+            verify_result.verified_cert.get());
 
   EXPECT_NE(google_full_chain, verify_result.verified_cert);
   EXPECT_TRUE(X509Certificate::IsSameOSCert(
@@ -1199,7 +1205,7 @@ TEST_F(CertVerifyProcTest, CRLSet) {
                                     "root_ca_cert.pem",
                                     X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_cert_list.size());
-  ScopedTestRoot test_root(ca_cert_list[0]);
+  ScopedTestRoot test_root(ca_cert_list[0].get());
 
   CertificateList cert_list = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "ok_cert.pem", X509Certificate::FORMAT_AUTO);
@@ -1250,7 +1256,7 @@ TEST_F(CertVerifyProcTest, CRLSetLeafSerial) {
                                     "quic_root.crt",
                                     X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_cert_list.size());
-  ScopedTestRoot test_root(ca_cert_list[0]);
+  ScopedTestRoot test_root(ca_cert_list[0].get());
 
   CertificateList intermediate_cert_list =
       CreateCertificateListFromFile(GetTestCertsDirectory(),
@@ -1333,16 +1339,16 @@ TEST_P(CertVerifyProcWeakDigestTest, Verify) {
   if (data.root_cert_filename) {
      scoped_refptr<X509Certificate> root_cert =
          ImportCertFromFile(certs_dir, data.root_cert_filename);
-     ASSERT_NE(static_cast<X509Certificate*>(NULL), root_cert);
+     ASSERT_NE(static_cast<X509Certificate*>(NULL), root_cert.get());
      test_root.Reset(root_cert.get());
   }
 
   scoped_refptr<X509Certificate> intermediate_cert =
       ImportCertFromFile(certs_dir, data.intermediate_cert_filename);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert.get());
   scoped_refptr<X509Certificate> ee_cert =
       ImportCertFromFile(certs_dir, data.ee_cert_filename);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), ee_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), ee_cert.get());
 
   X509Certificate::OSCertHandles intermediates;
   intermediates.push_back(intermediate_cert->os_cert_handle());
@@ -1350,7 +1356,7 @@ TEST_P(CertVerifyProcWeakDigestTest, Verify) {
   scoped_refptr<X509Certificate> ee_chain =
       X509Certificate::CreateFromHandle(ee_cert->os_cert_handle(),
                                         intermediates);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), ee_chain);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), ee_chain.get());
 
   int flags = 0;
   CertVerifyResult verify_result;
diff --git a/net/cert/crl_set_storage.cc b/net/cert/crl_set_storage.cc
index 0288bcc..1b11d78 100644
--- a/net/cert/crl_set_storage.cc
+++ b/net/cert/crl_set_storage.cc
@@ -350,7 +350,7 @@ bool CRLSetStorage::Parse(base::StringPiece data,
     crl_set->crls_index_by_issuer_[back_pair->first] = crl_index;
   }
 
-  if (!CopyBlockedSPKIsFromHeader(crl_set, header_dict.get()))
+  if (!CopyBlockedSPKIsFromHeader(crl_set.get(), header_dict.get()))
     return false;
 
   *out_crl_set = crl_set;
@@ -398,7 +398,7 @@ bool CRLSetStorage::ApplyDelta(const CRLSet* in_crl_set,
   crl_set->sequence_ = static_cast<uint32>(sequence);
   crl_set->not_after_ = static_cast<uint64>(not_after);
 
-  if (!CopyBlockedSPKIsFromHeader(crl_set, header_dict.get()))
+  if (!CopyBlockedSPKIsFromHeader(crl_set.get(), header_dict.get()))
     return false;
 
   std::vector<uint8> crl_changes;
diff --git a/net/cert/crl_set_unittest.cc b/net/cert/crl_set_unittest.cc
index 76bd4c1..16b3dfc 100644
--- a/net/cert/crl_set_unittest.cc
+++ b/net/cert/crl_set_unittest.cc
@@ -223,10 +223,10 @@ TEST(CRLSetTest, NoOpDeltaUpdate) {
   scoped_refptr<net::CRLSet> delta_set;
   base::StringPiece delta(reinterpret_cast<const char*>(kNoopDeltaCRL),
                           sizeof(kNoopDeltaCRL));
-  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set));
+  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
   ASSERT_TRUE(delta_set.get() != NULL);
 
-  std::string out = net::CRLSetStorage::Serialize(delta_set);
+  std::string out = net::CRLSetStorage::Serialize(delta_set.get());
   EXPECT_EQ(s.as_string(), out);
 }
 
@@ -240,7 +240,7 @@ TEST(CRLSetTest, AddCRLDelta) {
   scoped_refptr<net::CRLSet> delta_set;
   base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta),
                           sizeof(kAddCRLDelta));
-  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set));
+  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
   ASSERT_TRUE(delta_set.get() != NULL);
 
   const net::CRLSet::CRLList& crls = delta_set->crls();
@@ -262,13 +262,14 @@ TEST(CRLSetTest, AddRemoveCRLDelta) {
   scoped_refptr<net::CRLSet> delta_set;
   base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta),
                           sizeof(kAddCRLDelta));
-  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set));
+  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
   ASSERT_TRUE(delta_set.get() != NULL);
 
   scoped_refptr<net::CRLSet> delta2_set;
   base::StringPiece delta2(reinterpret_cast<const char*>(kRemoveCRLDelta),
                            sizeof(kRemoveCRLDelta));
-  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(delta_set, delta2, &delta2_set));
+  EXPECT_TRUE(
+      net::CRLSetStorage::ApplyDelta(delta_set.get(), delta2, &delta2_set));
   ASSERT_TRUE(delta2_set.get() != NULL);
 
   const net::CRLSet::CRLList& crls = delta2_set->crls();
@@ -287,7 +288,7 @@ TEST(CRLSetTest, UpdateSerialsDelta) {
   scoped_refptr<net::CRLSet> delta_set;
   base::StringPiece delta(reinterpret_cast<const char*>(kUpdateSerialsDelta),
                           sizeof(kUpdateSerialsDelta));
-  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set));
+  EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
   ASSERT_TRUE(delta_set.get() != NULL);
 
   const net::CRLSet::CRLList& crls = delta_set->crls();
diff --git a/net/cert/ct_log_verifier_unittest.cc b/net/cert/ct_log_verifier_unittest.cc
index 9b3211d..23cbf51 100644
--- a/net/cert/ct_log_verifier_unittest.cc
+++ b/net/cert/ct_log_verifier_unittest.cc
@@ -36,7 +36,7 @@ TEST_F(CTLogVerifierTest, VerifiesCertSCT) {
   scoped_refptr<ct::SignedCertificateTimestamp> cert_sct;
   ct::GetX509CertSCT(&cert_sct);
 
-  EXPECT_TRUE(log_->Verify(cert_entry, *cert_sct));
+  EXPECT_TRUE(log_->Verify(cert_entry, *cert_sct.get()));
 }
 
 TEST_F(CTLogVerifierTest, VerifiesPrecertSCT) {
@@ -46,7 +46,7 @@ TEST_F(CTLogVerifierTest, VerifiesPrecertSCT) {
   scoped_refptr<ct::SignedCertificateTimestamp> precert_sct;
   ct::GetPrecertSCT(&precert_sct);
 
-  EXPECT_TRUE(log_->Verify(precert_entry, *precert_sct));
+  EXPECT_TRUE(log_->Verify(precert_entry, *precert_sct.get()));
 }
 
 TEST_F(CTLogVerifierTest, FailsInvalidTimestamp) {
@@ -59,7 +59,7 @@ TEST_F(CTLogVerifierTest, FailsInvalidTimestamp) {
   // Mangle the timestamp, so that it should fail signature validation.
   cert_sct->timestamp = base::Time::Now();
 
-  EXPECT_FALSE(log_->Verify(cert_entry, *cert_sct));
+  EXPECT_FALSE(log_->Verify(cert_entry, *cert_sct.get()));
 }
 
 TEST_F(CTLogVerifierTest, FailsInvalidLogID) {
@@ -73,7 +73,7 @@ TEST_F(CTLogVerifierTest, FailsInvalidLogID) {
   // attempting signature validation.
   cert_sct->log_id.assign(cert_sct->log_id.size(), '\0');
 
-  EXPECT_FALSE(log_->Verify(cert_entry, *cert_sct));
+  EXPECT_FALSE(log_->Verify(cert_entry, *cert_sct.get()));
 }
 
 TEST_F(CTLogVerifierTest, SetsValidSTH) {
diff --git a/net/cert/ct_objects_extractor_unittest.cc b/net/cert/ct_objects_extractor_unittest.cc
index b229a47..5feff3e 100644
--- a/net/cert/ct_objects_extractor_unittest.cc
+++ b/net/cert/ct_objects_extractor_unittest.cc
@@ -107,7 +107,7 @@ TEST_F(CTObjectsExtractorTest, ExtractedSCTVerifies) {
                                  precert_chain_[1]->os_cert_handle(),
                                  &entry));
 
-  EXPECT_TRUE(log_->Verify(entry, *sct));
+  EXPECT_TRUE(log_->Verify(entry, *sct.get()));
 }
 
 // Test that an externally-provided SCT verifies over the LogEntry
@@ -120,7 +120,7 @@ TEST_F(CTObjectsExtractorTest, ComplementarySCTVerifies) {
   LogEntry entry;
   ASSERT_TRUE(GetX509LogEntry(test_cert_->os_cert_handle(), &entry));
 
-  EXPECT_TRUE(log_->Verify(entry, *sct));
+  EXPECT_TRUE(log_->Verify(entry, *sct.get()));
 }
 
 // Test that the extractor can parse OCSP responses.
diff --git a/net/cert/multi_log_ct_verifier.cc b/net/cert/multi_log_ct_verifier.cc
index f3014ad..6c8d5bd 100644
--- a/net/cert/multi_log_ct_verifier.cc
+++ b/net/cert/multi_log_ct_verifier.cc
@@ -213,7 +213,7 @@ bool MultiLogCTVerifier::VerifySingleSCT(
 
   sct->log_description = it->second->description();
 
-  if (!it->second->Verify(expected_entry, *sct)) {
+  if (!it->second->Verify(expected_entry, *sct.get())) {
     DVLOG(1) << "Unable to verify SCT signature.";
     result->invalid_scts.push_back(sct);
     LogSCTStatusToUMA(ct::SCT_STATUS_INVALID);
diff --git a/net/cert/multi_log_ct_verifier_unittest.cc b/net/cert/multi_log_ct_verifier_unittest.cc
index c2ae25e..c5e0146 100644
--- a/net/cert/multi_log_ct_verifier_unittest.cc
+++ b/net/cert/multi_log_ct_verifier_unittest.cc
@@ -48,13 +48,13 @@ class MultiLogCTVerifierTest : public ::testing::Test {
     chain_ = X509Certificate::CreateFromBytes(
         der_test_cert.data(),
         der_test_cert.length());
-    ASSERT_TRUE(chain_);
+    ASSERT_TRUE(chain_.get());
 
     embedded_sct_chain_ =
         CreateCertificateChainFromFile(GetTestCertsDirectory(),
                                        "ct-test-embedded-cert.pem",
                                        X509Certificate::FORMAT_AUTO);
-    ASSERT_TRUE(embedded_sct_chain_);
+    ASSERT_TRUE(embedded_sct_chain_.get());
   }
 
   bool CheckForSingleVerifiedSCTInResult(const ct::CTVerifyResult& result) {
@@ -130,9 +130,11 @@ class MultiLogCTVerifierTest : public ::testing::Test {
   bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain,
                                        const BoundNetLog& bound_net_log,
                                        ct::CTVerifyResult* result) {
-    return verifier_->Verify(
-               chain, std::string(), std::string(), result, bound_net_log) ==
-           OK;
+    return verifier_->Verify(chain.get(),
+                             std::string(),
+                             std::string(),
+                             result,
+                             bound_net_log) == OK;
   }
 
   bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain) {
@@ -141,9 +143,11 @@ class MultiLogCTVerifierTest : public ::testing::Test {
     BoundNetLog bound_net_log =
         BoundNetLog::Make(&net_log, NetLog::SOURCE_CONNECT_JOB);
 
-    return verifier_->Verify(
-               chain, std::string(), std::string(), &result, bound_net_log) ==
-           OK;
+    return verifier_->Verify(chain.get(),
+                             std::string(),
+                             std::string(),
+                             &result,
+                             bound_net_log) == OK;
   }
 
   bool CheckPrecertificateVerification(scoped_refptr<X509Certificate> chain) {
@@ -199,7 +203,7 @@ TEST_F(MultiLogCTVerifierTest, VerifiesEmbeddedSCTWithPreCA) {
       CreateCertificateChainFromFile(GetTestCertsDirectory(),
                                      "ct-test-embedded-with-preca-chain.pem",
                                      X509Certificate::FORMAT_AUTO));
-  ASSERT_TRUE(chain);
+  ASSERT_TRUE(chain.get());
   ASSERT_TRUE(CheckPrecertificateVerification(chain));
 }
 
@@ -208,7 +212,7 @@ TEST_F(MultiLogCTVerifierTest, VerifiesEmbeddedSCTWithIntermediate) {
       GetTestCertsDirectory(),
       "ct-test-embedded-with-intermediate-chain.pem",
       X509Certificate::FORMAT_AUTO));
-  ASSERT_TRUE(chain);
+  ASSERT_TRUE(chain.get());
   ASSERT_TRUE(CheckPrecertificateVerification(chain));
 }
 
@@ -218,7 +222,7 @@ TEST_F(MultiLogCTVerifierTest,
       GetTestCertsDirectory(),
       "ct-test-embedded-with-intermediate-preca-chain.pem",
       X509Certificate::FORMAT_AUTO));
-  ASSERT_TRUE(chain);
+  ASSERT_TRUE(chain.get());
   ASSERT_TRUE(CheckPrecertificateVerification(chain));
 }
 
@@ -231,8 +235,8 @@ TEST_F(MultiLogCTVerifierTest,
 
   ct::CTVerifyResult result;
   EXPECT_EQ(OK,
-            verifier_->Verify(chain_, std::string(), sct_list, &result,
-                              BoundNetLog()));
+            verifier_->Verify(
+                chain_.get(), std::string(), sct_list, &result, BoundNetLog()));
   ASSERT_TRUE(CheckForSingleVerifiedSCTInResult(result));
   ASSERT_TRUE(CheckForSCTOrigin(
       result, ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION));
@@ -245,7 +249,7 @@ TEST_F(MultiLogCTVerifierTest,
 
   EXPECT_NE(OK,
             verifier_->Verify(
-                chain_, std::string(), sct_list, &result, BoundNetLog()));
+                chain_.get(), std::string(), sct_list, &result, BoundNetLog()));
   EXPECT_EQ(1U, result.unknown_logs_scts.size());
   EXPECT_EQ("", result.unknown_logs_scts[0]->log_description);
 }
@@ -266,8 +270,8 @@ TEST_F(MultiLogCTVerifierTest, CountsInvalidSCTsInStatusHistogram) {
       "Net.CertificateTransparency.SCTStatus", ct::SCT_STATUS_LOG_UNKNOWN);
 
   EXPECT_NE(OK,
-            verifier_->Verify(chain_, std::string(), sct_list, &result,
-                              BoundNetLog()));
+            verifier_->Verify(
+                chain_.get(), std::string(), sct_list, &result, BoundNetLog()));
 
   ASSERT_EQ(num_valid_scts, NumValidSCTsInStatusHistogram());
   ASSERT_EQ(num_invalid_scts + 1,
diff --git a/net/cert/multi_threaded_cert_verifier.cc b/net/cert/multi_threaded_cert_verifier.cc
index 3d1b048..fc41fa9 100644
--- a/net/cert/multi_threaded_cert_verifier.cc
+++ b/net/cert/multi_threaded_cert_verifier.cc
@@ -93,9 +93,9 @@ base::Value* CertVerifyResultCallback(const CertVerifyResult& verify_result,
   results->SetBoolean("common_name_fallback_used",
                       verify_result.common_name_fallback_used);
   results->SetInteger("cert_status", verify_result.cert_status);
-  results->Set(
-      "verified_cert",
-      NetLogX509CertificateCallback(verify_result.verified_cert, log_level));
+  results->Set("verified_cert",
+               NetLogX509CertificateCallback(verify_result.verified_cert.get(),
+                                             log_level));
 
   base::ListValue* hashes = new base::ListValue();
   for (std::vector<HashValue>::const_iterator it =
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc
index 3a0c765..bf7de6d 100644
--- a/net/cert/multi_threaded_cert_verifier_unittest.cc
+++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -79,7 +79,7 @@ TEST_F(MultiThreadedCertVerifierTest, CacheHit) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(certs_dir, "ok_cert.pem"));
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
 
   int error;
   CertVerifyResult verify_result;
@@ -129,15 +129,15 @@ TEST_F(MultiThreadedCertVerifierTest, DifferentCACerts) {
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "salesforce_com_test.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert.get());
 
   scoped_refptr<X509Certificate> intermediate_cert1 =
       ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2011.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert1);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert1.get());
 
   scoped_refptr<X509Certificate> intermediate_cert2 =
       ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2016.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert2);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert2.get());
 
   X509Certificate::OSCertHandles intermediates;
   intermediates.push_back(intermediate_cert1->os_cert_handle());
@@ -196,7 +196,7 @@ TEST_F(MultiThreadedCertVerifierTest, InflightJoin) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(certs_dir, "ok_cert.pem"));
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
 
   int error;
   CertVerifyResult verify_result;
@@ -240,7 +240,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(certs_dir, "ok_cert.pem"));
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
 
   int error;
   CertVerifyResult verify_result;
@@ -289,7 +289,7 @@ TEST_F(MultiThreadedCertVerifierTest, MAYBE_CancelRequestThenQuit) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(certs_dir, "ok_cert.pem"));
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
 
   int error;
   CertVerifyResult verify_result;
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
index 7e6755f..0d24ea6e 100644
--- a/net/cert/nss_cert_database.cc
+++ b/net/cert/nss_cert_database.cc
@@ -422,7 +422,7 @@ void NSSCertDatabase::ListCertsImpl(crypto::ScopedPK11Slot slot,
 }
 
 scoped_refptr<base::TaskRunner> NSSCertDatabase::GetSlowTaskRunner() const {
-  if (slow_task_runner_for_test_)
+  if (slow_task_runner_for_test_.get())
     return slow_task_runner_for_test_;
   return base::WorkerPool::GetTaskRunner(true /*task is slow*/);
 }
@@ -432,7 +432,7 @@ void NSSCertDatabase::NotifyCertRemovalAndCallBack(
     const DeleteCertCallback& callback,
     bool success) {
   if (success)
-    NotifyObserversOfCertRemoved(cert);
+    NotifyObserversOfCertRemoved(cert.get());
   callback.Run(success);
 }
 
diff --git a/net/cert/x509_certificate_unittest.cc b/net/cert/x509_certificate_unittest.cc
index fb16ed5..211e0ec 100644
--- a/net/cert/x509_certificate_unittest.cc
+++ b/net/cert/x509_certificate_unittest.cc
@@ -91,7 +91,7 @@ const double kGoogleParseValidTo = 1324252799;
 void CheckGoogleCert(const scoped_refptr<X509Certificate>& google_cert,
                      uint8* expected_fingerprint,
                      double valid_from, double valid_to) {
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert.get());
 
   const CertPrincipal& subject = google_cert->subject();
   EXPECT_EQ("www.google.com", subject.common_name);
@@ -146,7 +146,7 @@ TEST(X509CertificateTest, WebkitCertParsing) {
   scoped_refptr<X509Certificate> webkit_cert(X509Certificate::CreateFromBytes(
       reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)));
 
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), webkit_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), webkit_cert.get());
 
   const CertPrincipal& subject = webkit_cert->subject();
   EXPECT_EQ("Cupertino", subject.locality_name);
@@ -202,7 +202,7 @@ TEST(X509CertificateTest, ThawteCertParsing) {
   scoped_refptr<X509Certificate> thawte_cert(X509Certificate::CreateFromBytes(
       reinterpret_cast<const char*>(thawte_der), sizeof(thawte_der)));
 
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), thawte_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), thawte_cert.get());
 
   const CertPrincipal& subject = thawte_cert->subject();
   EXPECT_EQ("www.thawte.com", subject.common_name);
@@ -254,7 +254,7 @@ TEST(X509CertificateTest, MultivalueRDN) {
 
   scoped_refptr<X509Certificate> multivalue_rdn_cert =
       ImportCertFromFile(certs_dir, "multivalue_rdn.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), multivalue_rdn_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), multivalue_rdn_cert.get());
 
   const CertPrincipal& subject = multivalue_rdn_cert->subject();
   EXPECT_EQ("Multivalue RDN Test", subject.common_name);
@@ -278,7 +278,7 @@ TEST(X509CertificateTest, UnescapedSpecialCharacters) {
 
   scoped_refptr<X509Certificate> unescaped_cert =
       ImportCertFromFile(certs_dir, "unescaped.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), unescaped_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), unescaped_cert.get());
 
   const CertPrincipal& subject = unescaped_cert->subject();
   EXPECT_EQ("127.0.0.1", subject.common_name);
@@ -328,15 +328,15 @@ TEST(X509CertificateTest, CAFingerprints) {
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "salesforce_com_test.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert.get());
 
   scoped_refptr<X509Certificate> intermediate_cert1 =
       ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2011.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert1);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert1.get());
 
   scoped_refptr<X509Certificate> intermediate_cert2 =
       ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2016.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert2);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert2.get());
 
   X509Certificate::OSCertHandles intermediates;
   intermediates.push_back(intermediate_cert1->os_cert_handle());
@@ -456,7 +456,7 @@ TEST(X509CertificateTest, ParseSubjectAltNames) {
 
   scoped_refptr<X509Certificate> san_cert =
       ImportCertFromFile(certs_dir, "subjectAltName_sanity_check.pem");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), san_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), san_cert.get());
 
   std::vector<std::string> dns_names;
   std::vector<std::string> ip_addresses;
@@ -493,7 +493,7 @@ TEST(X509CertificateTest, ExtractSPKIFromDERCert) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> cert =
       ImportCertFromFile(certs_dir, "nist.der");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), cert.get());
 
   std::string derBytes;
   EXPECT_TRUE(X509Certificate::GetDEREncoded(cert->os_cert_handle(),
@@ -513,7 +513,7 @@ TEST(X509CertificateTest, ExtractCRLURLsFromDERCert) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> cert =
       ImportCertFromFile(certs_dir, "nist.der");
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), cert.get());
 
   std::string derBytes;
   EXPECT_TRUE(X509Certificate::GetDEREncoded(cert->os_cert_handle(),
@@ -603,7 +603,7 @@ TEST(X509CertificateTest, Pickle) {
   scoped_refptr<X509Certificate> cert_from_pickle =
       X509Certificate::CreateFromPickle(
           pickle, &iter, X509Certificate::PICKLETYPE_CERTIFICATE_CHAIN_V3);
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), cert_from_pickle);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), cert_from_pickle.get());
   EXPECT_TRUE(X509Certificate::IsSameOSCert(
       cert->os_cert_handle(), cert_from_pickle->os_cert_handle()));
   const X509Certificate::OSCertHandles& cert_intermediates =
@@ -766,7 +766,7 @@ TEST(X509CertificateTest, IsIssuedByEncoded) {
   // Test a client certificate from MIT.
   scoped_refptr<X509Certificate> mit_davidben_cert(
       ImportCertFromFile(certs_dir, "mit.davidben.der"));
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), mit_davidben_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), mit_davidben_cert.get());
 
   std::string mit_issuer(reinterpret_cast<const char*>(MITDN),
                          sizeof(MITDN));
@@ -774,7 +774,7 @@ TEST(X509CertificateTest, IsIssuedByEncoded) {
   // Test a certificate from Google, issued by Thawte
   scoped_refptr<X509Certificate> google_cert(
       ImportCertFromFile(certs_dir, "google.single.der"));
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert.get());
 
   std::string thawte_issuer(reinterpret_cast<const char*>(ThawteDN),
                             sizeof(ThawteDN));
@@ -876,7 +876,7 @@ TEST(X509CertificateTest, GetDefaultNickname) {
 
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(certs_dir, "no_subject_common_name_cert.pem"));
-  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert);
+  ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
 
   std::string nickname = test_cert->GetDefaultNickname(USER_CERT);
   EXPECT_EQ("wtc@google.com's COMODO Client Authentication and "