| Index: net/socket/client_socket_factory.h
|
| diff --git a/net/socket/client_socket_factory.h b/net/socket/client_socket_factory.h
|
| index be12df748788bebe51bde0d4c0f70629c2085293..ea1aacbbabfd3e0525bbef0c0300fcb1461335f1 100644
|
| --- a/net/socket/client_socket_factory.h
|
| +++ b/net/socket/client_socket_factory.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef NET_SOCKET_CLIENT_SOCKET_FACTORY_H_
|
| #define NET_SOCKET_CLIENT_SOCKET_FACTORY_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/base/net_export.h"
|
| #include "net/base/rand_callback.h"
|
| #include "net/base/socket_performance_watcher.h"
|
| @@ -33,23 +33,23 @@ class NET_EXPORT ClientSocketFactory {
|
|
|
| // |source| is the NetLog::Source for the entity trying to create the socket,
|
| // if it has one.
|
| - virtual scoped_ptr<DatagramClientSocket> CreateDatagramClientSocket(
|
| + virtual std::unique_ptr<DatagramClientSocket> CreateDatagramClientSocket(
|
| DatagramSocket::BindType bind_type,
|
| const RandIntCallback& rand_int_cb,
|
| NetLog* net_log,
|
| const NetLog::Source& source) = 0;
|
|
|
| - virtual scoped_ptr<StreamSocket> CreateTransportClientSocket(
|
| + virtual std::unique_ptr<StreamSocket> CreateTransportClientSocket(
|
| const AddressList& addresses,
|
| - scoped_ptr<SocketPerformanceWatcher> socket_performance_watcher,
|
| + std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
|
| NetLog* net_log,
|
| const NetLog::Source& source) = 0;
|
|
|
| // It is allowed to pass in a |transport_socket| that is not obtained from a
|
| // socket pool. The caller could create a ClientSocketHandle directly and call
|
| // set_socket() on it to set a valid StreamSocket instance.
|
| - virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket(
|
| - scoped_ptr<ClientSocketHandle> transport_socket,
|
| + virtual std::unique_ptr<SSLClientSocket> CreateSSLClientSocket(
|
| + std::unique_ptr<ClientSocketHandle> transport_socket,
|
| const HostPortPair& host_and_port,
|
| const SSLConfig& ssl_config,
|
| const SSLClientSocketContext& context) = 0;
|
|
|