Refactor the API for CertVerifier::Verify() and the implementation of MultiThreadedCertVerifier::Ver

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/debug/leak_annotations.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
@@ skipping 67 matching lines @@
 
 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.get());
 
   int error;
   CertVerifyResult verify_result;
   TestCompletionCallback callback;
-  CertVerifier::RequestHandle request_handle;
+  scoped_ptr<CertVerifier::Request> request_handle;
 
   error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
                            NULL, &verify_result, callback.callback(),
                            &request_handle, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
   ASSERT_EQ(1u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
@@ skipping 39 matching lines @@
 
   intermediates.clear();
   intermediates.push_back(intermediate_cert2->os_cert_handle());
   scoped_refptr<X509Certificate> cert_chain2 =
       X509Certificate::CreateFromHandle(server_cert->os_cert_handle(),
                                         intermediates);
 
   int error;
   CertVerifyResult verify_result;
   TestCompletionCallback callback;
-  CertVerifier::RequestHandle request_handle;
+  scoped_ptr<CertVerifier::Request> request_handle;
 
   error = verifier_.Verify(cert_chain1.get(), "www.example.com", std::string(),
                            0, NULL, &verify_result, callback.callback(),
                            &request_handle, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
   ASSERT_EQ(1u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
@@ skipping 16 matching lines @@
 // Tests an inflight join.
 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.get());
 
   int error;
   CertVerifyResult verify_result;
   TestCompletionCallback callback;
-  CertVerifier::RequestHandle request_handle;
+  scoped_ptr<CertVerifier::Request> request_handle;
   CertVerifyResult verify_result2;
   TestCompletionCallback callback2;
-  CertVerifier::RequestHandle request_handle2;
+  scoped_ptr<CertVerifier::Request> request_handle2;
 
   error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
                            NULL, &verify_result, callback.callback(),
                            &request_handle, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle);
   error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
                            NULL, &verify_result2, callback2.callback(),
                            &request_handle2, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle2 != NULL);
   error = callback.WaitForResult();
   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();
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(certs_dir, "ok_cert.pem"));
   ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
 
   int error;
   CertVerifyResult verify_result;
-  CertVerifier::RequestHandle request_handle;
+  scoped_ptr<CertVerifier::Request> request_handle;
 
   error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
                            NULL, &verify_result, base::Bind(&FailTest),
                            &request_handle, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   ASSERT_TRUE(request_handle != NULL);
-  verifier_.CancelRequest(request_handle);
+  request_handle.reset();
 
   // Issue a few more requests to the worker pool and wait for their
   // completion, so that the task of the canceled request (which runs on a
   // worker thread) is likely to complete by the end of this test.
   TestCompletionCallback callback;
   for (int i = 0; i < 5; ++i) {
     error = verifier_.Verify(test_cert.get(), "www2.example.com", std::string(),
                              0, NULL, &verify_result, callback.callback(),
                              &request_handle, BoundNetLog());
     ASSERT_EQ(ERR_IO_PENDING, error);
     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.get());
 
   int error;
   CertVerifyResult verify_result;
   TestCompletionCallback callback;
-  CertVerifier::RequestHandle request_handle;
+  scoped_ptr<CertVerifier::Request> request_handle;
 
   {
     // Because shutdown intentionally doesn't join worker threads, a
     // CertVerifyWorker may be leaked if the main thread shuts down before the
     // worker thread.
     ANNOTATE_SCOPED_MEMORY_LEAK;
     error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(),
                              0, NULL, &verify_result, callback.callback(),
                              &request_handle, BoundNetLog());
   }
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle);
-  verifier_.CancelRequest(request_handle);
+  request_handle.reset();
   // 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 110 matching lines @@
 
   const CertificateList empty_cert_list;
   CertificateList cert_list;
   cert_list.push_back(test_cert);
 
   // Check that Verify() asks the |trust_provider| for the current list of
   // additional trust anchors.
   int error;
   CertVerifyResult verify_result;
   TestCompletionCallback callback;
-  CertVerifier::RequestHandle request_handle;
+  scoped_ptr<CertVerifier::Request> request_handle;
   EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
       .WillOnce(ReturnRef(empty_cert_list));
   error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
                            NULL, &verify_result, callback.callback(),
                            &request_handle, BoundNetLog());
   Mock::VerifyAndClearExpectations(&trust_provider);
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
@@ skipping 22 matching lines @@
   Mock::VerifyAndClearExpectations(&trust_provider);
   ASSERT_EQ(ERR_IO_PENDING, error);
   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