Index: net/spdy/spdy_websocket_stream_unittest.cc |
diff --git a/net/spdy/spdy_websocket_stream_unittest.cc b/net/spdy/spdy_websocket_stream_unittest.cc |
index 54a71009de08a72a126991e1416524517935087d..42dd95c434d9d53a6c425885579a7b4dd0546891 100644 |
--- a/net/spdy/spdy_websocket_stream_unittest.cc |
+++ b/net/spdy/spdy_websocket_stream_unittest.cc |
@@ -277,7 +277,7 @@ class SpdyWebSocketStreamTest |
SpdySessionDependencies session_deps_; |
scoped_ptr<OrderedSocketData> data_; |
scoped_refptr<HttpNetworkSession> http_session_; |
- scoped_refptr<SpdySession> session_; |
+ base::WeakPtr<SpdySession> session_; |
scoped_ptr<SpdyWebSocketStream> websocket_stream_; |
SpdyStreamId stream_id_; |
SpdyStreamId created_stream_id_; |
@@ -336,7 +336,7 @@ TEST_P(SpdyWebSocketStreamTest, Basic) { |
base::Bind(&SpdyWebSocketStreamTest::DoSendClosingFrame, |
base::Unretained(this))); |
- websocket_stream_.reset(new SpdyWebSocketStream(session_.get(), &delegate)); |
+ websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate)); |
BoundNetLog net_log; |
GURL url("ws://example.com/echo"); |
@@ -408,7 +408,7 @@ TEST_P(SpdyWebSocketStreamTest, DestructionBeforeClose) { |
base::Bind(&SpdyWebSocketStreamTest::DoSync, |
base::Unretained(this))); |
- websocket_stream_.reset(new SpdyWebSocketStream(session_.get(), &delegate)); |
+ websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate)); |
BoundNetLog net_log; |
GURL url("ws://example.com/echo"); |
@@ -470,7 +470,7 @@ TEST_P(SpdyWebSocketStreamTest, DestructionAfterExplicitClose) { |
base::Bind(&SpdyWebSocketStreamTest::DoClose, |
base::Unretained(this))); |
- websocket_stream_.reset(new SpdyWebSocketStream(session_.get(), &delegate)); |
+ websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate)); |
BoundNetLog net_log; |
GURL url("ws://example.com/echo"); |
@@ -535,7 +535,7 @@ TEST_P(SpdyWebSocketStreamTest, IOPending) { |
SpdyWebSocketStreamEventRecorder block_delegate((CompletionCallback())); |
scoped_ptr<SpdyWebSocketStream> block_stream( |
- new SpdyWebSocketStream(session_.get(), &block_delegate)); |
+ new SpdyWebSocketStream(session_, &block_delegate)); |
BoundNetLog block_net_log; |
GURL block_url("ws://example.com/block"); |
ASSERT_EQ(OK, |
@@ -553,7 +553,7 @@ TEST_P(SpdyWebSocketStreamTest, IOPending) { |
base::Bind(&SpdyWebSocketStreamTest::DoSendClosingFrame, |
base::Unretained(this))); |
- websocket_stream_.reset(new SpdyWebSocketStream(session_.get(), &delegate)); |
+ websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate)); |
BoundNetLog net_log; |
GURL url("ws://example.com/echo"); |
ASSERT_EQ(ERR_IO_PENDING, websocket_stream_->InitializeStream( |