Update CertVerifier::Verify to use RequestParams instead

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 <memory>
 
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 72 matching lines @@
   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;
   std::unique_ptr<CertVerifier::Request> request;
 
-  error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
-                           NULL, &verify_result, callback.callback(), &request,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request);
   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", std::string(), 0,
-                           NULL, &verify_result, callback.callback(), &request,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   // Synchronous completion.
   ASSERT_NE(ERR_IO_PENDING, error);
   ASSERT_TRUE(IsCertificateError(error));
   ASSERT_FALSE(request);
   ASSERT_EQ(2u, verifier_.requests());
   ASSERT_EQ(1u, verifier_.cache_hits());
   ASSERT_EQ(0u, verifier_.inflight_joins());
   ASSERT_EQ(1u, verifier_.GetCacheSize());
 }
 
@@ skipping 25 matching lines @@
   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;
   std::unique_ptr<CertVerifier::Request> request;
 
-  error = verifier_.Verify(cert_chain1.get(), "www.example.com", std::string(),
-                           0, NULL, &verify_result, callback.callback(),
-                           &request, BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(cert_chain1, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request);
   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", std::string(),
-                           0, NULL, &verify_result, callback.callback(),
-                           &request, BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(cert_chain2, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request);
   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) {
   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;
   std::unique_ptr<CertVerifier::Request> request;
   CertVerifyResult verify_result2;
   TestCompletionCallback callback2;
   std::unique_ptr<CertVerifier::Request> request2;
 
-  error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
-                           NULL, &verify_result, callback.callback(), &request,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request);
-  error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
-                           NULL, &verify_result2, callback2.callback(),
-                           &request2, BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result2, callback2.callback(), &request2, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request2);
   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;
   std::unique_ptr<CertVerifier::Request> request;
 
-  error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
-                           NULL, &verify_result, base::Bind(&FailTest),
-                           &request, BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, base::Bind(&FailTest), &request, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   ASSERT_TRUE(request);
   request.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, BoundNetLog());
+    error = verifier_.Verify(
+        CertVerifier::RequestParams(test_cert, "www2.example.com", 0,
+                                    std::string(), CertificateList()),
+        NULL, &verify_result, callback.callback(), &request, BoundNetLog());
     ASSERT_EQ(ERR_IO_PENDING, error);
     EXPECT_TRUE(request);
     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;
   std::unique_ptr<CertVerifier::Request> request;
 
   {
     // Because shutdown intentionally doesn't join worker threads, memory may
     // be leaked if the main thread shuts down before the worker thread
     // completes. In particular MultiThreadedCertVerifier calls
     // base::WorkerPool::PostTaskAndReply(), which leaks its "relay" when it
     // can't post the reply back to the origin thread. See
     // https://crbug.com/522514
     ANNOTATE_SCOPED_MEMORY_LEAK;
-    error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(),
-                             0, NULL, &verify_result, callback.callback(),
-                             &request, BoundNetLog());
+    error = verifier_.Verify(
+        CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                    std::string(), CertificateList()),
+        NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   }
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request);
   request.reset();
   // Destroy |verifier| by going out of scope.
 }
 
 TEST_F(MultiThreadedCertVerifierTest, CertTrustAnchorProvider) {
   MockCertTrustAnchorProvider trust_provider;
   verifier_.SetCertTrustAnchorProvider(&trust_provider);
 
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"));
   ASSERT_TRUE(test_cert.get());
 
   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;
   std::unique_ptr<CertVerifier::Request> request;
   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,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   Mock::VerifyAndClearExpectations(&trust_provider);
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request);
   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", std::string(), 0,
-                           NULL, &verify_result, callback.callback(), &request,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   Mock::VerifyAndClearExpectations(&trust_provider);
   EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
   EXPECT_FALSE(request);
   ASSERT_EQ(2u, verifier_.requests());
   ASSERT_EQ(1u, verifier_.cache_hits());
 
   // Another Verify() for the same certificate but with a different list of
   // trust anchors will not reuse the cache.
   EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
       .WillOnce(ReturnRef(cert_list));
-  error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
-                           NULL, &verify_result, callback.callback(), &request,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
+                                  std::string(), CertificateList()),
+      NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   Mock::VerifyAndClearExpectations(&trust_provider);
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request);
   error = callback.WaitForResult();
   EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
   ASSERT_EQ(3u, verifier_.requests());
   ASSERT_EQ(1u, verifier_.cache_hits());
 }
 
 // Tests de-duplication of requests.
@@ skipping 19 matching lines @@
   std::unique_ptr<CertVerifier::Request> request4;
   CertVerifyResult verify_result5;
   TestCompletionCallback callback5;
   std::unique_ptr<CertVerifier::Request> request5;
 
   const char domain1[] = "www.example1.com";
   const char domain2[] = "www.exampleB.com";
   const char domain3[] = "www.example3.com";
 
   // Start 3 unique requests.
-  error = verifier_.Verify(test_cert.get(), domain2, std::string(), 0, nullptr,
-                           &verify_result1, callback1.callback(), &request1,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, domain2, 0, std::string(),
+                                  CertificateList()),
+      nullptr, &verify_result1, callback1.callback(), &request1, BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request1);
 
-  error = verifier_.Verify(test_cert.get(), domain2, std::string(), 0, nullptr,
-                           &verify_result2, callback2.callback(), &request2,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, domain2, 0, std::string(),
+                                  CertificateList()),
+      nullptr, &verify_result2, callback2.callback(), &request2, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request2);
 
-  error = verifier_.Verify(test_cert.get(), domain3, std::string(), 0, nullptr,
-                           &verify_result3, callback3.callback(), &request3,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, domain3, 0, std::string(),
+                                  CertificateList()),
+      nullptr, &verify_result3, callback3.callback(), &request3, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request3);
 
   // Start duplicate requests (which should join to existing jobs).
-  error = verifier_.Verify(test_cert.get(), domain1, std::string(), 0, nullptr,
-                           &verify_result4, callback4.callback(), &request4,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, domain1, 0, std::string(),
+                                  CertificateList()),
+      nullptr, &verify_result4, callback4.callback(), &request4, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request4);
 
-  error = verifier_.Verify(test_cert.get(), domain2, std::string(), 0, nullptr,
-                           &verify_result5, callback5.callback(), &request5,
-                           BoundNetLog());
+  error = verifier_.Verify(
+      CertVerifier::RequestParams(test_cert, domain2, 0, std::string(),
+                                  CertificateList()),
+      nullptr, &verify_result5, callback5.callback(), &request5, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request5);
 
   error = callback1.WaitForResult();
   EXPECT_TRUE(IsCertificateError(error));
   error = callback2.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
   error = callback4.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
 
   // Let the other requests automatically cancel.
   ASSERT_EQ(5u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
   ASSERT_EQ(2u, verifier_.inflight_joins());
 }
 
 }  // namespace net