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

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

Issue 2724013002: net: remove CryptoModule class (Closed)
Patch Set: 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 | « net/cert/nss_cert_database.cc ('k') | net/cert/nss_cert_database_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/nss_cert_database_chromeos.h" 5 #include "net/cert/nss_cert_database_chromeos.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <pk11pub.h> 8 #include <pk11pub.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
11 #include <memory> 11 #include <memory>
12 #include <utility> 12 #include <utility>
13 13
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/task_runner.h" 17 #include "base/task_runner.h"
18 #include "net/base/crypto_module.h"
19 #include "net/cert/x509_certificate.h" 18 #include "net/cert/x509_certificate.h"
20 19
21 namespace net { 20 namespace net {
22 21
23 NSSCertDatabaseChromeOS::NSSCertDatabaseChromeOS( 22 NSSCertDatabaseChromeOS::NSSCertDatabaseChromeOS(
24 crypto::ScopedPK11Slot public_slot, 23 crypto::ScopedPK11Slot public_slot,
25 crypto::ScopedPK11Slot private_slot) 24 crypto::ScopedPK11Slot private_slot)
26 : NSSCertDatabase(std::move(public_slot), std::move(private_slot)) { 25 : NSSCertDatabase(std::move(public_slot), std::move(private_slot)) {
27 // By default, don't use a system slot. Only if explicitly set by 26 // By default, don't use a system slot. Only if explicitly set by
28 // SetSystemSlot, the system slot will be used. 27 // SetSystemSlot, the system slot will be used.
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 certs->begin(), 87 certs->begin(),
89 certs->end(), 88 certs->end(),
90 NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate( 89 NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate(
91 profile_filter)), 90 profile_filter)),
92 certs->end()); 91 certs->end());
93 DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size 92 DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size
94 << " certs"; 93 << " certs";
95 } 94 }
96 95
97 } // namespace net 96 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/nss_cert_database.cc ('k') | net/cert/nss_cert_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698