Changes to HttpNetworkTransaction for WebSocket Handshake

net/http/http_network_session_peer.cc

Index: net/http/http_network_session_peer.cc
diff --git a/net/http/http_network_session_peer.cc b/net/http/http_network_session_peer.cc
index 2a4ad33be37d15834a9f666b8596cdfd917b9979..b762a5f0438da77fd2ac297c06c489481949cfb4 100644
--- a/net/http/http_network_session_peer.cc
+++ b/net/http/http_network_session_peer.cc
@@ -21,8 +21,8 @@ HttpNetworkSessionPeer::HttpNetworkSessionPeer(
 HttpNetworkSessionPeer::~HttpNetworkSessionPeer() {}
 
 void HttpNetworkSessionPeer::SetClientSocketPoolManager(
-    ClientSocketPoolManager* socket_pool_manager) {
-  session_->normal_socket_pool_manager_.reset(socket_pool_manager);
+    scoped_ptr<ClientSocketPoolManager> socket_pool_manager) {
+  session_->normal_socket_pool_manager_.swap(socket_pool_manager);
 }
 
 void HttpNetworkSessionPeer::SetProxyService(ProxyService* proxy_service) {
@@ -30,13 +30,13 @@ void HttpNetworkSessionPeer::SetProxyService(ProxyService* proxy_service) {
 }
 
 void HttpNetworkSessionPeer::SetHttpStreamFactory(
-    HttpStreamFactory* http_stream_factory) {
-  session_->http_stream_factory_.reset(http_stream_factory);
+    scoped_ptr<HttpStreamFactory> http_stream_factory) {
+  session_->http_stream_factory_.swap(http_stream_factory);
 }
 
-void HttpNetworkSessionPeer::SetWebSocketStreamFactory(
-    HttpStreamFactory* http_stream_factory) {
-  session_->websocket_handshake_stream_factory_.reset(http_stream_factory);
+void HttpNetworkSessionPeer::SetWebSocketHandshakeStreamFactory(
+    scoped_ptr<HttpStreamFactory> http_stream_factory) {
+  session_->websocket_handshake_stream_factory_.swap(http_stream_factory);
 }
 
 }  // namespace net