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

net/cert/multi_threaded_cert_verifier_unittest.cc

Index: net/cert/multi_threaded_cert_verifier_unittest.cc
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc
index 142e65a8f648156e29b12d5387c1c0657213964d..d411e58e95ecce812aae55444c79cf7e3d14423e 100644
--- a/net/cert/multi_threaded_cert_verifier_unittest.cc
+++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -85,7 +85,7 @@ TEST_F(MultiThreadedCertVerifierTest, CacheHit) {
   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(),
@@ -145,7 +145,7 @@ TEST_F(MultiThreadedCertVerifierTest, DifferentCACerts) {
   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(),
@@ -182,10 +182,10 @@ TEST_F(MultiThreadedCertVerifierTest, InflightJoin) {
   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(),
@@ -215,14 +215,14 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
 
   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
@@ -249,7 +249,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) {
   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
@@ -262,7 +262,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) {
   }
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle);
-  verifier_.CancelRequest(request_handle);
+  request_handle.reset();
   // Destroy |verifier| by going out of scope.
 }
 
@@ -393,7 +393,7 @@ TEST_F(MultiThreadedCertVerifierTest, CertTrustAnchorProvider) {
   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,