[SPDY] Use WeakPtr<SpdySession> everywhere but SpdySessionPool

net/spdy/spdy_websocket_stream_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_websocket_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 259 matching lines @@
   }
 
   SpdyWebSocketTestUtil spdy_util_;
   SpdySettingsIds spdy_settings_id_to_set_;
   SpdySettingsFlags spdy_settings_flags_to_set_;
   uint32 spdy_settings_value_to_set_;
   SettingsMap spdy_settings_to_send_;
   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_;
   scoped_ptr<SpdyFrame> request_frame_;
   scoped_ptr<SpdyFrame> response_frame_;
   scoped_ptr<SpdyFrame> message_frame_;
   scoped_ptr<SpdyFrame> closing_frame_;
   HostPortPair host_port_pair_;
   SpdySessionKey spdy_session_key_;
   TestCompletionCallback completion_callback_;
@@ skipping 38 matching lines @@
   InitSession(reads, arraysize(reads), writes, arraysize(writes), false);
 
   SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());
   delegate.SetOnReceivedHeader(
       base::Bind(&SpdyWebSocketStreamTest::DoSendHelloFrame,
                  base::Unretained(this)));
   delegate.SetOnReceivedData(
       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(OK, websocket_stream_->InitializeStream(url, HIGHEST, net_log));
 
   ASSERT_TRUE(websocket_stream_->stream_.get());
 
   SendRequest();
 
   completion_callback_.WaitForResult();
@@ skipping 51 matching lines @@
   InitSession(reads, arraysize(reads), writes, arraysize(writes), false);
 
   SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());
   delegate.SetOnReceivedHeader(
       base::Bind(&SpdyWebSocketStreamTest::DoSendHelloFrame,
                  base::Unretained(this)));
   delegate.SetOnReceivedData(
       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");
   ASSERT_EQ(OK, websocket_stream_->InitializeStream(url, HIGHEST, net_log));
 
   SendRequest();
 
   sync_callback_.WaitForResult();
 
   // WebSocketStream destruction remove its SPDY stream from the session.
@@ skipping 41 matching lines @@
   InitSession(reads, arraysize(reads), writes, arraysize(writes), false);
 
   SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());
   delegate.SetOnReceivedHeader(
       base::Bind(&SpdyWebSocketStreamTest::DoSendHelloFrame,
                  base::Unretained(this)));
   delegate.SetOnReceivedData(
       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");
   ASSERT_EQ(OK, websocket_stream_->InitializeStream(url, HIGHEST, net_log));
 
   SendRequest();
 
   completion_callback_.WaitForResult();
 
   // SPDY stream has already been removed from the session by Close().
@@ skipping 44 matching lines @@
     MockRead(SYNCHRONOUS, 0, 11)  // EOF cause OnCloseSpdyStream event.
   };
 
   InitSession(reads, arraysize(reads), writes, arraysize(writes), true);
 
   // Create a dummy WebSocketStream which cause ERR_IO_PENDING to another
   // WebSocketStream under test.
   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,
             block_stream->InitializeStream(block_url, HIGHEST, block_net_log));
 
   // Create a WebSocketStream under test.
   SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());
   delegate.SetOnCreated(
       base::Bind(&SpdyWebSocketStreamTest::DoSync,
                  base::Unretained(this)));
   delegate.SetOnReceivedHeader(
       base::Bind(&SpdyWebSocketStreamTest::DoSendHelloFrame,
                  base::Unretained(this)));
   delegate.SetOnReceivedData(
       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(
       url, HIGHEST, net_log));
 
   // Delete the fist stream to allow create the second stream.
   block_stream.reset();
   ASSERT_EQ(OK, sync_callback_.WaitForResult());
 
   SendRequest();
@@ skipping 35 matching lines @@
   EXPECT_EQ(OK, events[7].result);
 
   // EOF close SPDY session.
   EXPECT_FALSE(
       HasSpdySession(http_session_->spdy_session_pool(), spdy_session_key_));
   EXPECT_TRUE(data()->at_read_eof());
   EXPECT_TRUE(data()->at_write_eof());
 }
 
 }  // namespace net