Index: net/socket/ssl_client_socket_pool.cc |
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc |
index 2a2865c65f9c93b6c44adc8a3a6ae592c9d21038..00a36c5acbf5c276bd7b54a6fb79f6e68eebcefd 100644 |
--- a/net/socket/ssl_client_socket_pool.cc |
+++ b/net/socket/ssl_client_socket_pool.cc |
@@ -551,11 +551,12 @@ SSLClientSocketPool::~SSLClientSocketPool() { |
ssl_config_service_->RemoveObserver(this); |
} |
-scoped_ptr<ConnectJob> SSLClientSocketPool::SSLConnectJobFactory::NewConnectJob( |
+std::unique_ptr<ConnectJob> |
+SSLClientSocketPool::SSLConnectJobFactory::NewConnectJob( |
const std::string& group_name, |
const PoolBase::Request& request, |
ConnectJob::Delegate* delegate) const { |
- return scoped_ptr<ConnectJob>(new SSLConnectJob( |
+ return std::unique_ptr<ConnectJob>(new SSLConnectJob( |
group_name, request.priority(), request.respect_limits(), |
request.params(), ConnectionTimeout(), transport_pool_, socks_pool_, |
http_proxy_pool_, client_socket_factory_, context_, delegate, net_log_)); |
@@ -597,7 +598,7 @@ void SSLClientSocketPool::CancelRequest(const std::string& group_name, |
} |
void SSLClientSocketPool::ReleaseSocket(const std::string& group_name, |
- scoped_ptr<StreamSocket> socket, |
+ std::unique_ptr<StreamSocket> socket, |
int id) { |
base_.ReleaseSocket(group_name, std::move(socket), id); |
} |
@@ -624,11 +625,11 @@ LoadState SSLClientSocketPool::GetLoadState( |
return base_.GetLoadState(group_name, handle); |
} |
-scoped_ptr<base::DictionaryValue> SSLClientSocketPool::GetInfoAsValue( |
+std::unique_ptr<base::DictionaryValue> SSLClientSocketPool::GetInfoAsValue( |
const std::string& name, |
const std::string& type, |
bool include_nested_pools) const { |
- scoped_ptr<base::DictionaryValue> dict(base_.GetInfoAsValue(name, type)); |
+ std::unique_ptr<base::DictionaryValue> dict(base_.GetInfoAsValue(name, type)); |
if (include_nested_pools) { |
base::ListValue* list = new base::ListValue(); |
if (transport_pool_) { |