Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(649)

Side by Side Diff: net/cert/multi_threaded_cert_verifier_unittest.cc

Issue 2602243002: Use TaskScheduler instead of WorkerPool in multi_threaded_cert_verifier.cc. (Closed)
Patch Set: self-review Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/cert/multi_threaded_cert_verifier.h" 5 #include "net/cert/multi_threaded_cert_verifier.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/debug/leak_annotations.h" 10 #include "base/debug/leak_annotations.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/format_macros.h" 12 #include "base/format_macros.h"
13 #include "base/message_loop/message_loop.h"
14 #include "base/test/scoped_task_scheduler.h"
13 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
14 #include "net/base/test_completion_callback.h" 16 #include "net/base/test_completion_callback.h"
15 #include "net/cert/cert_verify_proc.h" 17 #include "net/cert/cert_verify_proc.h"
16 #include "net/cert/cert_verify_result.h" 18 #include "net/cert/cert_verify_result.h"
17 #include "net/cert/x509_certificate.h" 19 #include "net/cert/x509_certificate.h"
18 #include "net/log/net_log_with_source.h" 20 #include "net/log/net_log_with_source.h"
19 #include "net/test/cert_test_util.h" 21 #include "net/test/cert_test_util.h"
20 #include "net/test/gtest_util.h" 22 #include "net/test/gtest_util.h"
21 #include "net/test/test_data_directory.h" 23 #include "net/test/test_data_directory.h"
22 #include "testing/gmock/include/gmock/gmock.h" 24 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 verify_result->verified_cert = cert; 57 verify_result->verified_cert = cert;
56 verify_result->cert_status = CERT_STATUS_COMMON_NAME_INVALID; 58 verify_result->cert_status = CERT_STATUS_COMMON_NAME_INVALID;
57 return ERR_CERT_COMMON_NAME_INVALID; 59 return ERR_CERT_COMMON_NAME_INVALID;
58 } 60 }
59 }; 61 };
60 62
61 } // namespace 63 } // namespace
62 64
63 class MultiThreadedCertVerifierTest : public ::testing::Test { 65 class MultiThreadedCertVerifierTest : public ::testing::Test {
64 public: 66 public:
65 MultiThreadedCertVerifierTest() : verifier_(new MockCertVerifyProc()) {} 67 MultiThreadedCertVerifierTest()
68 : verifier_(new MockCertVerifyProc()),
69 scoped_task_scheduler_(base::MessageLoop::current()) {}
66 ~MultiThreadedCertVerifierTest() override {} 70 ~MultiThreadedCertVerifierTest() override {}
67 71
68 protected: 72 protected:
69 MultiThreadedCertVerifier verifier_; 73 MultiThreadedCertVerifier verifier_;
74
75 private:
76 base::test::ScopedTaskScheduler scoped_task_scheduler_;
70 }; 77 };
71 78
72 // Tests an inflight join. 79 // Tests an inflight join.
73 TEST_F(MultiThreadedCertVerifierTest, InflightJoin) { 80 TEST_F(MultiThreadedCertVerifierTest, InflightJoin) {
74 base::FilePath certs_dir = GetTestCertsDirectory(); 81 base::FilePath certs_dir = GetTestCertsDirectory();
75 scoped_refptr<X509Certificate> test_cert( 82 scoped_refptr<X509Certificate> test_cert(
76 ImportCertFromFile(certs_dir, "ok_cert.pem")); 83 ImportCertFromFile(certs_dir, "ok_cert.pem"));
77 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get()); 84 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
78 85
79 int error; 86 int error;
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 ASSERT_TRUE(IsCertificateError(error)); 257 ASSERT_TRUE(IsCertificateError(error));
251 error = callback4.WaitForResult(); 258 error = callback4.WaitForResult();
252 ASSERT_TRUE(IsCertificateError(error)); 259 ASSERT_TRUE(IsCertificateError(error));
253 260
254 // Let the other requests automatically cancel. 261 // Let the other requests automatically cancel.
255 ASSERT_EQ(5u, verifier_.requests()); 262 ASSERT_EQ(5u, verifier_.requests());
256 ASSERT_EQ(2u, verifier_.inflight_joins()); 263 ASSERT_EQ(2u, verifier_.inflight_joins());
257 } 264 }
258 265
259 } // namespace net 266 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698