Fix some potential after free errors on TestCompletionCallback

net/cert/multi_threaded_cert_verifier_unittest.cc

 // Copyright (c) 2012 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/cert/multi_threaded_cert_verifier.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 77 matching lines @@
 
   error = verifier_.Verify(test_cert.get(),
                            "www.example.com",
                            0,
                            NULL,
                            &verify_result,
                            callback.callback(),
                            &request_handle,
                            BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
-  ASSERT_TRUE(request_handle != NULL);
+  EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
   ASSERT_EQ(1u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
   ASSERT_EQ(0u, verifier_.inflight_joins());
   ASSERT_EQ(1u, verifier_.GetCacheSize());
 
   error = verifier_.Verify(test_cert.get(),
                            "www.example.com",
                            0,
@@ skipping 49 matching lines @@
 
   error = verifier_.Verify(cert_chain1.get(),
                            "www.example.com",
                            0,
                            NULL,
                            &verify_result,
                            callback.callback(),
                            &request_handle,
                            BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
-  ASSERT_TRUE(request_handle != NULL);
+  EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
   ASSERT_EQ(1u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
   ASSERT_EQ(0u, verifier_.inflight_joins());
   ASSERT_EQ(1u, verifier_.GetCacheSize());
 
   error = verifier_.Verify(cert_chain2.get(),
                            "www.example.com",
                            0,
                            NULL,
                            &verify_result,
                            callback.callback(),
                            &request_handle,
                            BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
-  ASSERT_TRUE(request_handle != NULL);
+  EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
   ASSERT_EQ(2u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
   ASSERT_EQ(0u, verifier_.inflight_joins());
   ASSERT_EQ(2u, verifier_.GetCacheSize());
 }
 
 // Tests an inflight join.
 TEST_F(MultiThreadedCertVerifierTest, InflightJoin) {
@@ skipping 12 matching lines @@
 
   error = verifier_.Verify(test_cert.get(),
                            "www.example.com",
                            0,
                            NULL,
                            &verify_result,
                            callback.callback(),
                            &request_handle,
                            BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
-  ASSERT_TRUE(request_handle != NULL);
+  EXPECT_TRUE(request_handle);
   error = verifier_.Verify(test_cert.get(),
                            "www.example.com",
                            0,
                            NULL,
                            &verify_result2,
                            callback2.callback(),
                            &request_handle2,
                            BoundNetLog());
-  ASSERT_EQ(ERR_IO_PENDING, error);
-  ASSERT_TRUE(request_handle2 != NULL);
+  EXPECT_EQ(ERR_IO_PENDING, error);
+  EXPECT_TRUE(request_handle2 != NULL);
   error = callback.WaitForResult();
-  ASSERT_TRUE(IsCertificateError(error));
+  EXPECT_TRUE(IsCertificateError(error));
   error = callback2.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
   ASSERT_EQ(2u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
   ASSERT_EQ(1u, verifier_.inflight_joins());
 }
 
 // Tests that the callback of a canceled request is never made.
 TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
   base::FilePath certs_dir = GetTestCertsDirectory();
@@ skipping 24 matching lines @@
   for (int i = 0; i < 5; ++i) {
     error = verifier_.Verify(test_cert.get(),
                              "www2.example.com",
                              0,
                              NULL,
                              &verify_result,
                              callback.callback(),
                              &request_handle,
                              BoundNetLog());
     ASSERT_EQ(ERR_IO_PENDING, error);
-    ASSERT_TRUE(request_handle != NULL);
+    EXPECT_TRUE(request_handle);
     error = callback.WaitForResult();
     verifier_.ClearCache();
   }
 }
 
 // Tests that a canceled request is not leaked.
 TEST_F(MultiThreadedCertVerifierTest, 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);
 
   int error;
   CertVerifyResult verify_result;
   TestCompletionCallback callback;
   CertVerifier::RequestHandle request_handle;
 
   error = verifier_.Verify(test_cert.get(),
                            "www.example.com",
                            0,
                            NULL,
                            &verify_result,
                            callback.callback(),
                            &request_handle,
                            BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
-  ASSERT_TRUE(request_handle != NULL);
+  EXPECT_TRUE(request_handle);
   verifier_.CancelRequest(request_handle);
   // Destroy |verifier| by going out of scope.
 }
 
 TEST_F(MultiThreadedCertVerifierTest, RequestParamsComparators) {
   SHA1HashValue a_key;
   memset(a_key.data, 'a', sizeof(a_key.data));
 
   SHA1HashValue z_key;
   memset(z_key.data, 'z', sizeof(z_key.data));
@@ skipping 112 matching lines @@
   error = verifier_.Verify(test_cert.get(),
                            "www.example.com",
                            0,
                            NULL,
                            &verify_result,
                            callback.callback(),
                            &request_handle,
                            BoundNetLog());
   Mock::VerifyAndClearExpectations(&trust_provider);
   ASSERT_EQ(ERR_IO_PENDING, error);
-  ASSERT_TRUE(request_handle);
+  EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
   ASSERT_EQ(1u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
 
   // The next Verify() uses the cached result.
   EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
       .WillOnce(ReturnRef(empty_cert_list));
   error = verifier_.Verify(test_cert.get(),
                            "www.example.com",
@@ skipping 16 matching lines @@
   error = verifier_.Verify(test_cert.get(),
                            "www.example.com",
                            0,
                            NULL,
                            &verify_result,
                            callback.callback(),
                            &request_handle,
                            BoundNetLog());
   Mock::VerifyAndClearExpectations(&trust_provider);
   ASSERT_EQ(ERR_IO_PENDING, error);
-  ASSERT_TRUE(request_handle != NULL);
+  EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
   ASSERT_EQ(3u, verifier_.requests());
   ASSERT_EQ(1u, verifier_.cache_hits());
 }
 
 }  // namespace net