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

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

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/nss_cert_database_unittest.cc ('k') | net/dns/dns_hosts.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/cert/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/cert/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
23 CertificateList LoadCertificates(const base::FilePath& filename) { 23 CertificateList LoadCertificates(const base::FilePath& filename) {
24 std::string raw_cert; 24 std::string raw_cert;
25 if (!file_util::ReadFileToString(filename, &raw_cert)) { 25 if (!base::ReadFileToString(filename, &raw_cert)) {
26 LOG(ERROR) << "Can't load certificate " << filename.value(); 26 LOG(ERROR) << "Can't load certificate " << filename.value();
27 return CertificateList(); 27 return CertificateList();
28 } 28 }
29 29
30 return X509Certificate::CreateCertificateListFromBytes( 30 return X509Certificate::CreateCertificateListFromBytes(
31 raw_cert.data(), raw_cert.length(), X509Certificate::FORMAT_AUTO); 31 raw_cert.data(), raw_cert.length(), X509Certificate::FORMAT_AUTO);
32 } 32 }
33 33
34 } // namespace 34 } // namespace
35 35
(...skipping 31 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_.get()) 69 if (cert_.get())
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/nss_cert_database_unittest.cc ('k') | net/dns/dns_hosts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698