| 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/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" | |
| 10 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/files/file_util.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 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 520303003:
Change base/file_utils.h includes to base/files/file_utils.h in net/ (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master