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

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

Issue 13006020: net: extract net/cert out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « net/cert/test_root_certs.h ('k') | net/cert/test_root_certs_android.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 (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/base/test_root_certs.h" 5 #include "net/cert/test_root_certs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "net/base/x509_certificate.h" 12 #include "net/cert/x509_certificate.h"
13 13
14 namespace net { 14 namespace net {
15 15
16 namespace { 16 namespace {
17 17
18 bool g_has_instance = false; 18 bool g_has_instance = false;
19 19
20 base::LazyInstance<TestRootCerts>::Leaky 20 base::LazyInstance<TestRootCerts>::Leaky
21 g_test_root_certs = LAZY_INSTANCE_INITIALIZER; 21 g_test_root_certs = LAZY_INSTANCE_INITIALIZER;
22 22
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 void ScopedTestRoot::Reset(X509Certificate* cert) { 68 void ScopedTestRoot::Reset(X509Certificate* cert) {
69 if (cert_) 69 if (cert_)
70 TestRootCerts::GetInstance()->Clear(); 70 TestRootCerts::GetInstance()->Clear();
71 if (cert) 71 if (cert)
72 TestRootCerts::GetInstance()->Add(cert); 72 TestRootCerts::GetInstance()->Add(cert);
73 cert_ = cert; 73 cert_ = cert;
74 } 74 }
75 75
76 } // namespace net 76 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/test_root_certs.h ('k') | net/cert/test_root_certs_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698