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

Unified Diff: content/browser/ssl/ssl_client_auth_handler.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « content/browser/ssl/ssl_client_auth_handler.h ('k') | content/browser/ssl/ssl_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/ssl/ssl_client_auth_handler.cc
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index 9f5efaeee36f07348267f7d443e4552ffd0f15c5..e8c34a53e09e82dba2f866438c01842ccf3db549 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -62,7 +62,7 @@ void SelectCertificateOnUIThread(
const base::WeakPtr<SSLClientAuthHandler>& handler) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- scoped_ptr<ClientCertificateDelegate> delegate(
+ std::unique_ptr<ClientCertificateDelegate> delegate(
new ClientCertificateDelegateImpl(handler));
RenderFrameHost* rfh =
@@ -82,7 +82,7 @@ void SelectCertificateOnUIThread(
class SSLClientAuthHandler::Core : public base::RefCountedThreadSafe<Core> {
public:
Core(const base::WeakPtr<SSLClientAuthHandler>& handler,
- scoped_ptr<net::ClientCertStore> client_cert_store,
+ std::unique_ptr<net::ClientCertStore> client_cert_store,
net::SSLCertRequestInfo* cert_request_info)
: handler_(handler),
client_cert_store_(std::move(client_cert_store)),
@@ -116,12 +116,12 @@ class SSLClientAuthHandler::Core : public base::RefCountedThreadSafe<Core> {
}
base::WeakPtr<SSLClientAuthHandler> handler_;
- scoped_ptr<net::ClientCertStore> client_cert_store_;
+ std::unique_ptr<net::ClientCertStore> client_cert_store_;
scoped_refptr<net::SSLCertRequestInfo> cert_request_info_;
};
SSLClientAuthHandler::SSLClientAuthHandler(
- scoped_ptr<net::ClientCertStore> client_cert_store,
+ std::unique_ptr<net::ClientCertStore> client_cert_store,
net::URLRequest* request,
net::SSLCertRequestInfo* cert_request_info,
SSLClientAuthHandler::Delegate* delegate)
« no previous file with comments | « content/browser/ssl/ssl_client_auth_handler.h ('k') | content/browser/ssl/ssl_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698