[SPDY] Use WeakPtr<SpdySession> everywhere but SpdySessionPool

net/http/http_stream_factory_impl_unittest.cc

 // Copyright (c) 2012 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/http/http_stream_factory_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 183 matching lines @@
   scoped_ptr<HttpStreamBase> stream_;
   scoped_ptr<WebSocketStreamBase> websocket_stream_;
   SSLConfig used_ssl_config_;
   ProxyInfo used_proxy_info_;
 
   DISALLOW_COPY_AND_ASSIGN(StreamRequestWaiter);
 };
 
 class WebSocketSpdyStream : public MockWebSocketStream {
  public:
-  explicit WebSocketSpdyStream(SpdySession* spdy_session)
+  explicit WebSocketSpdyStream(const base::WeakPtr<SpdySession>& spdy_session)
       : MockWebSocketStream(kStreamTypeSpdy), spdy_session_(spdy_session) {}
 
   virtual ~WebSocketSpdyStream() {}
 
   SpdySession* spdy_session() { return spdy_session_.get(); }
 
  private:
-  scoped_refptr<SpdySession> spdy_session_;
+  base::WeakPtr<SpdySession> spdy_session_;
 };
 
 class WebSocketBasicStream : public MockWebSocketStream {
  public:
   explicit WebSocketBasicStream(ClientSocketHandle* connection)
       : MockWebSocketStream(kStreamTypeBasic), connection_(connection) {}
 
   virtual ~WebSocketBasicStream() {
     connection_->socket()->Disconnect();
   }
 
   ClientSocketHandle* connection() { return connection_.get(); }
 
  private:
   scoped_ptr<ClientSocketHandle> connection_;
 };
 
 class WebSocketStreamFactory : public WebSocketStreamBase::Factory {
  public:
   virtual ~WebSocketStreamFactory() {}
 
   virtual WebSocketStreamBase* CreateBasicStream(ClientSocketHandle* connection,
                                                  bool using_proxy) OVERRIDE {
     return new WebSocketBasicStream(connection);
   }
 
   virtual WebSocketStreamBase* CreateSpdyStream(
-      SpdySession* spdy_session,
+      const base::WeakPtr<SpdySession>& spdy_session,
       bool use_relative_url) OVERRIDE {
     return new WebSocketSpdyStream(spdy_session);
   }
 };
 
 struct TestCase {
   int num_streams;
   bool ssl;
 };
 
@@ skipping 764 matching lines @@
       HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
       HostPortPair("myproxy", 8888))));
   EXPECT_FALSE(waiter.used_proxy_info().is_direct());
 }
 
 TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) {
   SpdySessionDependencies session_deps(GetParam(),
                                        ProxyService::CreateDirect());
 
   MockRead mock_read(ASYNC, OK);
-  StaticSocketDataProvider socket_data(&mock_read, 1, NULL, 0);
+  DeterministicSocketData socket_data(&mock_read, 1, NULL, 0);
   socket_data.set_connect_data(MockConnect(ASYNC, OK));
-  session_deps.socket_factory->AddSocketDataProvider(&socket_data);
+  session_deps.deterministic_socket_factory->AddSocketDataProvider(
+      &socket_data);
 
   SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
   ssl_socket_data.SetNextProto(GetParam());
-  session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
+  session_deps.deterministic_socket_factory->AddSSLSocketDataProvider(
+      &ssl_socket_data);
 
   HostPortPair host_port_pair("www.google.com", 443);
   scoped_refptr<HttpNetworkSession>
-      session(SpdySessionDependencies::SpdyCreateSession(&session_deps));
+      session(SpdySessionDependencies::SpdyCreateSessionDeterministic(
+          &session_deps));
 
   // Now request a stream.
   HttpRequestInfo request_info;
   request_info.method = "GET";
   request_info.url = GURL("https://www.google.com");
   request_info.load_flags = 0;
 
   SSLConfig ssl_config;
   StreamRequestWaiter waiter;
   scoped_ptr<HttpStreamRequest> request(
@@ skipping 96 matching lines @@
       session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
   EXPECT_TRUE(waiter1.used_proxy_info().is_direct());
 }
 
 TEST_P(HttpStreamFactoryTest, OrphanedWebSocketStream) {
   UseAlternateProtocolsScopedSetter use_alternate_protocols(true);
   SpdySessionDependencies session_deps(GetParam(),
                                        ProxyService::CreateDirect());
 
   MockRead mock_read(ASYNC, OK);
-  StaticSocketDataProvider socket_data(&mock_read, 1, NULL, 0);
+  DeterministicSocketData socket_data(&mock_read, 1, NULL, 0);
   socket_data.set_connect_data(MockConnect(ASYNC, OK));
-  session_deps.socket_factory->AddSocketDataProvider(&socket_data);
+  session_deps.deterministic_socket_factory->AddSocketDataProvider(
+      &socket_data);
 
   MockRead mock_read2(ASYNC, OK);
-  StaticSocketDataProvider socket_data2(&mock_read2, 1, NULL, 0);
+  DeterministicSocketData socket_data2(&mock_read2, 1, NULL, 0);
   socket_data2.set_connect_data(MockConnect(ASYNC, ERR_IO_PENDING));
-  session_deps.socket_factory->AddSocketDataProvider(&socket_data2);
+  session_deps.deterministic_socket_factory->AddSocketDataProvider(
+      &socket_data2);
 
   SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
   ssl_socket_data.SetNextProto(GetParam());
-  session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
+  session_deps.deterministic_socket_factory->AddSSLSocketDataProvider(
+      &ssl_socket_data);
 
   scoped_refptr<HttpNetworkSession>
-      session(SpdySessionDependencies::SpdyCreateSession(&session_deps));
+      session(SpdySessionDependencies::SpdyCreateSessionDeterministic(
+          &session_deps));
 
   // Now request a stream.
   HttpRequestInfo request_info;
   request_info.method = "GET";
   request_info.url = GURL("ws://www.google.com:8888");
   request_info.load_flags = 0;
 
   session->http_server_properties()->SetAlternateProtocol(
       HostPortPair("www.google.com", 8888),
       9999,
@@ skipping 32 matching lines @@
   EXPECT_TRUE(waiter.used_proxy_info().is_direct());
 
   // Make sure there is no orphaned job. it is already canceled.
   ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>(
       session->websocket_stream_factory())->num_orphaned_jobs());
 }
 
 }  // namespace
 
 }  // namespace net