diff options
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 2 | ||||
| -rw-r--r-- | net/http/http_pipelined_host_forced.cc | 7 | ||||
| -rw-r--r-- | net/http/http_proxy_client_socket_pool.cc | 25 | ||||
| -rw-r--r-- | net/http/http_proxy_client_socket_pool.h | 4 | ||||
| -rw-r--r-- | net/http/http_stream_factory_impl_unittest.cc | 2 | ||||
| -rw-r--r-- | net/http/http_stream_parser_unittest.cc | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 0968b14..d89ab54 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -452,7 +452,7 @@ class CaptureGroupNameSocketPool : public ParentPool { virtual void CancelRequest(const std::string& group_name, ClientSocketHandle* handle) {} virtual void ReleaseSocket(const std::string& group_name, - StreamSocket* socket, + scoped_ptr<StreamSocket> socket, int id) {} virtual void CloseIdleSockets() {} virtual int IdleSocketCount() const { diff --git a/net/http/http_pipelined_host_forced.cc b/net/http/http_pipelined_host_forced.cc index 8179e86..8059d84 100644 --- a/net/http/http_pipelined_host_forced.cc +++ b/net/http/http_pipelined_host_forced.cc @@ -36,10 +36,9 @@ HttpPipelinedStream* HttpPipelinedHostForced::CreateStreamOnNewPipeline( bool was_npn_negotiated, NextProto protocol_negotiated) { CHECK(!pipeline_.get()); - StreamSocket* wrapped_socket = connection->release_socket(); - BufferedWriteStreamSocket* buffered_socket = new BufferedWriteStreamSocket( - wrapped_socket); - connection->set_socket(buffered_socket); + scoped_ptr<BufferedWriteStreamSocket> buffered_socket( + new BufferedWriteStreamSocket(connection->PassSocket())); + connection->SetSocket(buffered_socket.PassAs<StreamSocket>()); pipeline_.reset(factory_->CreateNewPipeline( connection, this, key_.origin(), used_ssl_config, used_proxy_info, net_log, was_npn_negotiated, protocol_negotiated)); diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index b80df37..c75df6f 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -289,7 +289,7 @@ int HttpProxyConnectJob::DoHttpProxyConnect() { int HttpProxyConnectJob::DoHttpProxyConnectComplete(int result) { if (result == OK || result == ERR_PROXY_AUTH_REQUESTED || result == ERR_HTTPS_PROXY_TUNNEL_RESPONSE) { - set_socket(transport_socket_.release()); + SetSocket(transport_socket_.PassAs<StreamSocket>()); } return result; @@ -380,19 +380,19 @@ HttpProxyConnectJobFactory::HttpProxyConnectJobFactory( } -ConnectJob* +scoped_ptr<ConnectJob> HttpProxyClientSocketPool::HttpProxyConnectJobFactory::NewConnectJob( const std::string& group_name, const PoolBase::Request& request, ConnectJob::Delegate* delegate) const { - return new HttpProxyConnectJob(group_name, - request.params(), - ConnectionTimeout(), - transport_pool_, - ssl_pool_, - host_resolver_, - delegate, - net_log_); + return scoped_ptr<ConnectJob>(new HttpProxyConnectJob(group_name, + request.params(), + ConnectionTimeout(), + transport_pool_, + ssl_pool_, + host_resolver_, + delegate, + net_log_)); } base::TimeDelta @@ -462,8 +462,9 @@ void HttpProxyClientSocketPool::CancelRequest( } void HttpProxyClientSocketPool::ReleaseSocket(const std::string& group_name, - StreamSocket* socket, int id) { - base_.ReleaseSocket(group_name, socket, id); + scoped_ptr<StreamSocket> socket, + int id) { + base_.ReleaseSocket(group_name, socket.Pass(), id); } void HttpProxyClientSocketPool::FlushWithError(int error) { diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h index a15b8ca..b77b5ae 100644 --- a/net/http/http_proxy_client_socket_pool.h +++ b/net/http/http_proxy_client_socket_pool.h @@ -204,7 +204,7 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool ClientSocketHandle* handle) OVERRIDE; virtual void ReleaseSocket(const std::string& group_name, - StreamSocket* socket, + scoped_ptr<StreamSocket> socket, int id) OVERRIDE; virtual void FlushWithError(int error) OVERRIDE; @@ -250,7 +250,7 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool NetLog* net_log); // ClientSocketPoolBase::ConnectJobFactory methods. - virtual ConnectJob* NewConnectJob( + virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const PoolBase::Request& request, ConnectJob::Delegate* delegate) const OVERRIDE; diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc index 14fbc03..f378c93 100644 --- a/net/http/http_stream_factory_impl_unittest.cc +++ b/net/http/http_stream_factory_impl_unittest.cc @@ -314,7 +314,7 @@ class CapturePreconnectsSocketPool : public ParentPool { ADD_FAILURE(); } virtual void ReleaseSocket(const std::string& group_name, - StreamSocket* socket, + scoped_ptr<StreamSocket> socket, int id) OVERRIDE { ADD_FAILURE(); } diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index d530c2d..8477594 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc @@ -220,7 +220,7 @@ TEST(HttpStreamParser, AsyncChunkAndAsyncSocket) { ASSERT_EQ(OK, rv); scoped_ptr<ClientSocketHandle> socket_handle(new ClientSocketHandle); - socket_handle->set_socket(transport.release()); + socket_handle->SetSocket(transport.PassAs<StreamSocket>()); HttpRequestInfo request_info; request_info.method = "GET"; @@ -375,7 +375,7 @@ TEST(HttpStreamParser, TruncatedHeaders) { ASSERT_EQ(OK, rv); scoped_ptr<ClientSocketHandle> socket_handle(new ClientSocketHandle); - socket_handle->set_socket(transport.release()); + socket_handle->SetSocket(transport.PassAs<StreamSocket>()); HttpRequestInfo request_info; request_info.method = "GET"; |