summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_session_peer.h
diff options
context:
space:
mode:
authorricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-14 02:14:44 +0000
committerricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-14 02:14:44 +0000
commit831e4a3102c7ad705d69386e52981c66a4ba0ccd (patch)
treef5f0e687cbe554caa6f7da3341fe1ff09a055660 /net/http/http_network_session_peer.h
parent993bd9bd5c7e6f7505b6f6cfe852f9d3e6f67e76 (diff)
downloadchromium_src-831e4a3102c7ad705d69386e52981c66a4ba0ccd.zip
chromium_src-831e4a3102c7ad705d69386e52981c66a4ba0ccd.tar.gz
chromium_src-831e4a3102c7ad705d69386e52981c66a4ba0ccd.tar.bz2
Add a SetWebSocketHandshakeStreamFactory() method to the HttpTransaction base class so that
URLRequestHttpJob can pass through the WebSocketHandshakeStreamBase::Factory object. Implement OnWebSocketHandshakeStreamReady(). BUG=315027 TEST=net_unittests Review URL: https://codereview.chromium.org/23856018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_session_peer.h')
-rw-r--r--net/http/http_network_session_peer.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/http/http_network_session_peer.h b/net/http/http_network_session_peer.h
index ebe1af1..4df7b75 100644
--- a/net/http/http_network_session_peer.h
+++ b/net/http/http_network_session_peer.h
@@ -6,6 +6,7 @@
#define NET_HTTP_HTTP_NETWORK_SESSION_PEER_H_
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
#include "net/base/net_export.h"
namespace net {
@@ -22,13 +23,13 @@ class NET_EXPORT_PRIVATE HttpNetworkSessionPeer {
~HttpNetworkSessionPeer();
void SetClientSocketPoolManager(
- ClientSocketPoolManager* socket_pool_manager);
+ scoped_ptr<ClientSocketPoolManager> socket_pool_manager);
void SetProxyService(ProxyService* proxy_service);
- void SetHttpStreamFactory(HttpStreamFactory* http_stream_factory);
- void SetWebSocketStreamFactory(
- HttpStreamFactory* websocket_handshake_stream_factory);
+ void SetHttpStreamFactory(scoped_ptr<HttpStreamFactory> http_stream_factory);
+ void SetWebSocketHandshakeStreamFactory(
+ scoped_ptr<HttpStreamFactory> websocket_handshake_stream_factory);
private:
const scoped_refptr<HttpNetworkSession> session_;