| Index: net/socket/client_socket_handle.h
|
| diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h
|
| index 23fc5cf07199029d81816724c746ffbf22a5e574..003730c07bbdd6ec6abe1257db51563a7b51e540 100644
|
| --- a/net/socket/client_socket_handle.h
|
| +++ b/net/socket/client_socket_handle.h
|
| @@ -74,7 +74,7 @@ class NET_EXPORT ClientSocketHandle {
|
| int Init(const std::string& group_name,
|
| const scoped_refptr<SocketParams>& socket_params,
|
| RequestPriority priority,
|
| - OldCompletionCallback* callback,
|
| + const CompletionCallback& callback,
|
| PoolType* pool,
|
| const BoundNetLog& net_log);
|
|
|
| @@ -173,7 +173,7 @@ class NET_EXPORT ClientSocketHandle {
|
| std::string group_name_;
|
| bool is_reused_;
|
| OldCompletionCallbackImpl<ClientSocketHandle> callback_;
|
| - OldCompletionCallback* user_callback_;
|
| + CompletionCallback user_callback_;
|
| base::TimeDelta idle_time_;
|
| int pool_id_; // See ClientSocketPool::ReleaseSocket() for an explanation.
|
| bool is_ssl_error_;
|
| @@ -192,7 +192,7 @@ template <typename SocketParams, typename PoolType>
|
| int ClientSocketHandle::Init(const std::string& group_name,
|
| const scoped_refptr<SocketParams>& socket_params,
|
| RequestPriority priority,
|
| - OldCompletionCallback* callback,
|
| + const CompletionCallback& callback,
|
| PoolType* pool,
|
| const BoundNetLog& net_log) {
|
| requesting_source_ = net_log.source();
|
|
|