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

Side by Side Diff: net/ssl/openssl_client_key_store.cc

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: iwyu Created 4 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
« no previous file with comments | « net/ssl/openssl_client_key_store.h ('k') | net/ssl/openssl_ssl_util.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/ssl/openssl_client_key_store.h" 5 #include "net/ssl/openssl_client_key_store.h"
6 6
7 #include <openssl/evp.h> 7 #include <openssl/evp.h>
8 #include <openssl/x509.h> 8 #include <openssl/x509.h>
9
9 #include <algorithm> 10 #include <algorithm>
11 #include <memory>
10 12
11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
13 #include "net/cert/x509_certificate.h" 14 #include "net/cert/x509_certificate.h"
14 15
15 namespace net { 16 namespace net {
16 17
17 namespace { 18 namespace {
18 19
19 // Return the EVP_PKEY holding the public key of a given certificate. 20 // Return the EVP_PKEY holding the public key of a given certificate.
20 // |cert| is a certificate. 21 // |cert| is a certificate.
21 // Returns a scoped EVP_PKEY for it. 22 // Returns a scoped EVP_PKEY for it.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 pairs_.clear(); 117 pairs_.clear();
117 } 118 }
118 119
119 OpenSSLClientKeyStore* OpenSSLClientKeyStore::GetInstance() { 120 OpenSSLClientKeyStore* OpenSSLClientKeyStore::GetInstance() {
120 return base::Singleton<OpenSSLClientKeyStore>::get(); 121 return base::Singleton<OpenSSLClientKeyStore>::get();
121 } 122 }
122 123
123 } // namespace net 124 } // namespace net
124 125
125 126
OLDNEW
« no previous file with comments | « net/ssl/openssl_client_key_store.h ('k') | net/ssl/openssl_ssl_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698