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

Side by Side Diff: net/test/cert_test_util_nss.cc

Issue 689563002: Cleanup: Remove unneeded path_service.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month 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/test/cert_test_util.cc ('k') | net/test/embedded_test_server/embedded_test_server.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/test/cert_test_util.h" 5 #include "net/test/cert_test_util.h"
6 6
7 #include <pk11pub.h> 7 #include <pk11pub.h>
8 #include <secmodt.h> 8 #include <secmodt.h>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/path_service.h"
13 #include "crypto/nss_util.h" 12 #include "crypto/nss_util.h"
14 #include "crypto/rsa_private_key.h" 13 #include "crypto/rsa_private_key.h"
15 #include "net/cert/cert_type.h" 14 #include "net/cert/cert_type.h"
16 15
17 namespace net { 16 namespace net {
18 17
19 scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile( 18 scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile(
20 const base::FilePath& dir, 19 const base::FilePath& dir,
21 const std::string& key_filename, 20 const std::string& key_filename,
22 PK11SlotInfo* slot) { 21 PK11SlotInfo* slot) {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 if (!ImportClientCertToSlot(cert, slot)) 78 if (!ImportClientCertToSlot(cert, slot))
80 return NULL; 79 return NULL;
81 80
82 // |cert| continues to point to the original X509Certificate before the 81 // |cert| continues to point to the original X509Certificate before the
83 // import to |slot|. However this should not make a difference as NSS handles 82 // import to |slot|. However this should not make a difference as NSS handles
84 // state globally. 83 // state globally.
85 return cert; 84 return cert;
86 } 85 }
87 86
88 } // namespace net 87 } // namespace net
OLDNEW
« no previous file with comments | « net/test/cert_test_util.cc ('k') | net/test/embedded_test_server/embedded_test_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698