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

chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc

Index: chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc b/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc
index 66ab8ced4cae9994fe4acf07dbb4aab9755f5850..14b628e4e70fc6908aa75beacc620d3691c5515e 100644
--- a/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc
+++ b/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc
@@ -66,9 +66,10 @@ class PolicyCertVerifierTest : public testing::Test {
   }
 
  protected:
-  int VerifyTestServerCert(const net::TestCompletionCallback& test_callback,
-                           net::CertVerifyResult* verify_result,
-                           net::CertVerifier::RequestHandle* request_handle) {
+  int VerifyTestServerCert(
+      const net::TestCompletionCallback& test_callback,
+      net::CertVerifyResult* verify_result,
+      scoped_ptr<net::CertVerifier::Request>* request_handle) {
     return cert_verifier_->Verify(test_server_cert_.get(), "127.0.0.1",
                                   std::string(), 0, NULL, verify_result,
                                   test_callback.callback(), request_handle,
@@ -126,7 +127,7 @@ TEST_F(PolicyCertVerifierTest, VerifyUntrustedCert) {
   {
     net::CertVerifyResult verify_result;
     net::TestCompletionCallback callback;
-    net::CertVerifier::RequestHandle request_handle = NULL;
+    scoped_ptr<net::CertVerifier::Request> request_handle;
     int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
     ASSERT_EQ(net::ERR_IO_PENDING, error);
     EXPECT_TRUE(request_handle);
@@ -139,7 +140,7 @@ TEST_F(PolicyCertVerifierTest, VerifyUntrustedCert) {
   {
     net::CertVerifyResult verify_result;
     net::TestCompletionCallback callback;
-    net::CertVerifier::RequestHandle request_handle = NULL;
+    scoped_ptr<net::CertVerifier::Request> request_handle;
     int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
     EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);
   }
@@ -162,7 +163,7 @@ TEST_F(PolicyCertVerifierTest, VerifyTrustedCert) {
   // Verify() successfully verifies |test_server_cert_| after it was imported.
   net::CertVerifyResult verify_result;
   net::TestCompletionCallback callback;
-  net::CertVerifier::RequestHandle request_handle = NULL;
+  scoped_ptr<net::CertVerifier::Request> request_handle;
   int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
   ASSERT_EQ(net::ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle);
@@ -181,7 +182,7 @@ TEST_F(PolicyCertVerifierTest, VerifyUsingAdditionalTrustAnchor) {
   {
     net::CertVerifyResult verify_result;
     net::TestCompletionCallback callback;
-    net::CertVerifier::RequestHandle request_handle = NULL;
+    scoped_ptr<net::CertVerifier::Request> request_handle;
     int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
     ASSERT_EQ(net::ERR_IO_PENDING, error);
     EXPECT_TRUE(request_handle);
@@ -195,7 +196,7 @@ TEST_F(PolicyCertVerifierTest, VerifyUsingAdditionalTrustAnchor) {
   {
     net::CertVerifyResult verify_result;
     net::TestCompletionCallback callback;
-    net::CertVerifier::RequestHandle request_handle = NULL;
+    scoped_ptr<net::CertVerifier::Request> request_handle;
     int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
     ASSERT_EQ(net::ERR_IO_PENDING, error);
     EXPECT_TRUE(request_handle);
@@ -209,7 +210,7 @@ TEST_F(PolicyCertVerifierTest, VerifyUsingAdditionalTrustAnchor) {
   {
     net::CertVerifyResult verify_result;
     net::TestCompletionCallback callback;
-    net::CertVerifier::RequestHandle request_handle = NULL;
+    scoped_ptr<net::CertVerifier::Request> request_handle;
     int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
     EXPECT_EQ(net::OK, error);
   }
@@ -220,7 +221,7 @@ TEST_F(PolicyCertVerifierTest, VerifyUsingAdditionalTrustAnchor) {
   {
     net::CertVerifyResult verify_result;
     net::TestCompletionCallback callback;
-    net::CertVerifier::RequestHandle request_handle = NULL;
+    scoped_ptr<net::CertVerifier::Request> request_handle;
     int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
     // Note: this hits the cached result from the first Verify() in this test.
     EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);