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

Side by Side Diff: chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc

Issue 2722733002: Revert of Use TaskScheduler instead of WorkerPool in nss_cert_database.cc. (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « no previous file | chromeos/cert_loader_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/chromeos/policy/policy_cert_verifier.h" 5 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/threading/thread_task_runner_handle.h"
15 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" 16 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
16 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
17 #include "content/public/test/test_browser_thread_bundle.h" 18 #include "content/public/test/test_browser_thread_bundle.h"
18 #include "crypto/nss_util_internal.h" 19 #include "crypto/nss_util_internal.h"
19 #include "crypto/scoped_test_nss_chromeos_user.h" 20 #include "crypto/scoped_test_nss_chromeos_user.h"
20 #include "net/base/test_completion_callback.h" 21 #include "net/base/test_completion_callback.h"
21 #include "net/cert/cert_verify_result.h" 22 #include "net/cert/cert_verify_result.h"
22 #include "net/cert/nss_cert_database_chromeos.h" 23 #include "net/cert/nss_cert_database_chromeos.h"
23 #include "net/cert/x509_certificate.h" 24 #include "net/cert/x509_certificate.h"
24 #include "net/log/net_log_with_source.h" 25 #include "net/log/net_log_with_source.h"
(...skipping 12 matching lines...) Expand all
37 38
38 void SetUp() override { 39 void SetUp() override {
39 ASSERT_TRUE(test_nss_user_.constructed_successfully()); 40 ASSERT_TRUE(test_nss_user_.constructed_successfully());
40 test_nss_user_.FinishInit(); 41 test_nss_user_.FinishInit();
41 42
42 test_cert_db_.reset(new net::NSSCertDatabaseChromeOS( 43 test_cert_db_.reset(new net::NSSCertDatabaseChromeOS(
43 crypto::GetPublicSlotForChromeOSUser(test_nss_user_.username_hash()), 44 crypto::GetPublicSlotForChromeOSUser(test_nss_user_.username_hash()),
44 crypto::GetPrivateSlotForChromeOSUser( 45 crypto::GetPrivateSlotForChromeOSUser(
45 test_nss_user_.username_hash(), 46 test_nss_user_.username_hash(),
46 base::Callback<void(crypto::ScopedPK11Slot)>()))); 47 base::Callback<void(crypto::ScopedPK11Slot)>())));
48 test_cert_db_->SetSlowTaskRunnerForTest(
49 base::ThreadTaskRunnerHandle::Get());
47 50
48 cert_verifier_.reset(new PolicyCertVerifier(base::Bind( 51 cert_verifier_.reset(new PolicyCertVerifier(base::Bind(
49 &PolicyCertVerifierTest::OnTrustAnchorUsed, base::Unretained(this)))); 52 &PolicyCertVerifierTest::OnTrustAnchorUsed, base::Unretained(this))));
50 cert_verifier_->InitializeOnIOThread(new chromeos::CertVerifyProcChromeOS( 53 cert_verifier_->InitializeOnIOThread(new chromeos::CertVerifyProcChromeOS(
51 crypto::GetPublicSlotForChromeOSUser(test_nss_user_.username_hash()))); 54 crypto::GetPublicSlotForChromeOSUser(test_nss_user_.username_hash())));
52 55
53 test_ca_cert_ = LoadCertificate("root_ca_cert.pem", net::CA_CERT); 56 test_ca_cert_ = LoadCertificate("root_ca_cert.pem", net::CA_CERT);
54 ASSERT_TRUE(test_ca_cert_.get()); 57 ASSERT_TRUE(test_ca_cert_.get());
55 test_server_cert_ = LoadCertificate("ok_cert.pem", net::SERVER_CERT); 58 test_server_cert_ = LoadCertificate("ok_cert.pem", net::SERVER_CERT);
56 ASSERT_TRUE(test_server_cert_.get()); 59 ASSERT_TRUE(test_server_cert_.get());
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 int error = VerifyTestServerCert(callback, &verify_result, &request); 228 int error = VerifyTestServerCert(callback, &verify_result, &request);
226 // Note: this hits the cached result from the first Verify() in this test. 229 // Note: this hits the cached result from the first Verify() in this test.
227 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error); 230 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);
228 } 231 }
229 // The additional trust anchors were reset, thus |cert_verifier_| should not 232 // The additional trust anchors were reset, thus |cert_verifier_| should not
230 // signal it's usage anymore. 233 // signal it's usage anymore.
231 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); 234 EXPECT_FALSE(WasTrustAnchorUsedAndReset());
232 } 235 }
233 236
234 } // namespace policy 237 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chromeos/cert_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698