OLD | NEW |
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/nss_cert_database.h" | 5 #include "net/cert/nss_cert_database.h" |
6 | 6 |
7 #include <cert.h> | 7 #include <cert.h> |
8 #include <certdb.h> | 8 #include <certdb.h> |
9 #include <keyhi.h> | 9 #include <keyhi.h> |
10 #include <pk11pub.h> | 10 #include <pk11pub.h> |
11 #include <secmod.h> | 11 #include <secmod.h> |
12 | 12 |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/callback.h" | 14 #include "base/callback.h" |
15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/macros.h" |
16 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.h" |
17 #include "base/observer_list_threadsafe.h" | 18 #include "base/observer_list_threadsafe.h" |
18 #include "base/task_runner.h" | 19 #include "base/task_runner.h" |
19 #include "base/task_runner_util.h" | 20 #include "base/task_runner_util.h" |
20 #include "base/threading/worker_pool.h" | 21 #include "base/threading/worker_pool.h" |
21 #include "crypto/scoped_nss_types.h" | 22 #include "crypto/scoped_nss_types.h" |
22 #include "net/base/crypto_module.h" | 23 #include "net/base/crypto_module.h" |
23 #include "net/base/net_errors.h" | 24 #include "net/base/net_errors.h" |
24 #include "net/cert/cert_database.h" | 25 #include "net/cert/cert_database.h" |
25 #include "net/cert/x509_certificate.h" | 26 #include "net/cert/x509_certificate.h" |
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
483 } else { | 484 } else { |
484 if (SEC_DeletePermCertificate(cert->os_cert_handle())) { | 485 if (SEC_DeletePermCertificate(cert->os_cert_handle())) { |
485 LOG(ERROR) << "SEC_DeletePermCertificate failed: " << PORT_GetError(); | 486 LOG(ERROR) << "SEC_DeletePermCertificate failed: " << PORT_GetError(); |
486 return false; | 487 return false; |
487 } | 488 } |
488 } | 489 } |
489 return true; | 490 return true; |
490 } | 491 } |
491 | 492 |
492 } // namespace net | 493 } // namespace net |
OLD | NEW |