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

Unified Diff: net/ssl/client_cert_store_nss.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/ssl/client_cert_store_nss.h ('k') | net/ssl/client_cert_store_unittest-inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/client_cert_store_nss.cc
diff --git a/net/ssl/client_cert_store_nss.cc b/net/ssl/client_cert_store_nss.cc
index 073745ef3ade2acee48f13d957094305f5e4b4ce..e46458ad99e166657007407f056cecac79ff4a5f 100644
--- a/net/ssl/client_cert_store_nss.cc
+++ b/net/ssl/client_cert_store_nss.cc
@@ -8,13 +8,13 @@
#include <ssl.h>
#include <algorithm>
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
#include "base/threading/worker_pool.h"
#include "crypto/nss_crypto_module_delegate.h"
@@ -32,7 +32,8 @@ ClientCertStoreNSS::~ClientCertStoreNSS() {}
void ClientCertStoreNSS::GetClientCerts(const SSLCertRequestInfo& request,
CertificateList* selected_certs,
const base::Closure& callback) {
- scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate> password_delegate;
+ std::unique_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
+ password_delegate;
if (!password_delegate_factory_.is_null()) {
password_delegate.reset(
password_delegate_factory_.Run(request.host_and_port));
@@ -114,7 +115,8 @@ void ClientCertStoreNSS::FilterCertsOnWorkerThread(
}
void ClientCertStoreNSS::GetAndFilterCertsOnWorkerThread(
- scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate> password_delegate,
+ std::unique_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
+ password_delegate,
const SSLCertRequestInfo* request,
CertificateList* selected_certs) {
CertificateList platform_certs;
@@ -124,7 +126,8 @@ void ClientCertStoreNSS::GetAndFilterCertsOnWorkerThread(
// static
void ClientCertStoreNSS::GetPlatformCertsOnWorkerThread(
- scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate> password_delegate,
+ std::unique_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
+ password_delegate,
net::CertificateList* certs) {
CERTCertList* found_certs =
CERT_FindUserCertsByUsage(CERT_GetDefaultCertDB(), certUsageSSLClient,
« no previous file with comments | « net/ssl/client_cert_store_nss.h ('k') | net/ssl/client_cert_store_unittest-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698