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

net/cert_net/nss_ocsp_unittest.cc

 // Copyright (c) 2013 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_net/nss_ocsp.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 120 matching lines @@
   ASSERT_TRUE(test_cert.get());
 
   scoped_refptr<X509Certificate> test_root(
       ImportCertFromFile(GetTestCertsDirectory(), "aia-root.pem"));
   ASSERT_TRUE(test_root.get());
 
   ScopedTestRoot scoped_root(test_root.get());
 
   CertVerifyResult verify_result;
   TestCompletionCallback test_callback;
-  CertVerifier::RequestHandle request_handle;
+  scoped_ptr<CertVerifier::Request> request;
 
   int flags = CertVerifier::VERIFY_CERT_IO_ENABLED;
   int error = verifier()->Verify(
       test_cert.get(), "aia-host.invalid", std::string(), flags, NULL,
-      &verify_result, test_callback.callback(), &request_handle, BoundNetLog());
+      &verify_result, test_callback.callback(), &request, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
 
   error = test_callback.WaitForResult();
 
   EXPECT_EQ(OK, error);
 
   // Ensure that NSS made an AIA request for the missing intermediate.
   EXPECT_LT(0, request_count());
 }
 
 }  // namespace net