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

Unified Diff: net/socket/ssl_client_socket_pool.h

Issue 1892323002: Change scoped_ptr to std::unique_ptr in //net/socket. (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 | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool.h
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index d5f480799ef0e705112d5f028fb3511c216a9efd..3dc03e5b84b2ac9a95b46d90a31f5cb887485253 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -5,11 +5,11 @@
#ifndef NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
#define NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "net/base/privacy_mode.h"
#include "net/http/http_response_info.h"
@@ -160,8 +160,8 @@ class SSLConnectJob : public ConnectJob {
State next_state_;
CompletionCallback callback_;
- scoped_ptr<ClientSocketHandle> transport_socket_handle_;
- scoped_ptr<SSLClientSocket> ssl_socket_;
+ std::unique_ptr<ClientSocketHandle> transport_socket_handle_;
+ std::unique_ptr<SSLClientSocket> ssl_socket_;
HttpResponseInfo error_response_info_;
@@ -218,7 +218,7 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
ClientSocketHandle* handle) override;
void ReleaseSocket(const std::string& group_name,
- scoped_ptr<StreamSocket> socket,
+ std::unique_ptr<StreamSocket> socket,
int id) override;
void FlushWithError(int error) override;
@@ -232,7 +232,7 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
LoadState GetLoadState(const std::string& group_name,
const ClientSocketHandle* handle) const override;
- scoped_ptr<base::DictionaryValue> GetInfoAsValue(
+ std::unique_ptr<base::DictionaryValue> GetInfoAsValue(
const std::string& name,
const std::string& type,
bool include_nested_pools) const override;
@@ -271,7 +271,7 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
~SSLConnectJobFactory() override;
// ClientSocketPoolBase::ConnectJobFactory methods.
- scoped_ptr<ConnectJob> NewConnectJob(
+ std::unique_ptr<ConnectJob> NewConnectJob(
const std::string& group_name,
const PoolBase::Request& request,
ConnectJob::Delegate* delegate) const override;
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698