Introduce RequestWebSocketStream into HttpStreamFactory

net/http/http_stream_factory_impl_unittest.cc

Index: net/http/http_stream_factory_impl_unittest.cc
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index cac7f02d254583abdb332ce8ab758f8dcb5ea55a..1b8a064f93eb02e38b72519a79b3697629bc1941 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -18,12 +18,17 @@
 #include "net/http/http_request_info.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/http_stream.h"
+#include "net/http/websocket_stream_base.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_service.h"
+#include "net/socket/client_socket_handle.h"
 #include "net/socket/mock_client_socket_pool_manager.h"
+#include "net/socket/next_proto.h"
 #include "net/socket/socket_test_util.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_test_util_common.h"
+#include "net/ssl/ssl_config_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -31,10 +36,29 @@ namespace net {
 
 namespace {
 
+class ScopedForceSpdySsl {
+ public:
+  ScopedForceSpdySsl():
+      orig_force_spdy_over_ssl_(HttpStreamFactory::force_spdy_over_ssl()),
+      orig_force_spdy_always_(HttpStreamFactory::force_spdy_always()) {
+    HttpStreamFactory::set_force_spdy_over_ssl(true);
+    HttpStreamFactory::set_force_spdy_always(true);
+  }
+  ~ScopedForceSpdySsl() {
+    HttpStreamFactory::set_force_spdy_over_ssl(orig_force_spdy_over_ssl_);
+    HttpStreamFactory::set_force_spdy_always(orig_force_spdy_always_);
+  }
+
+ private:
+  const bool orig_force_spdy_over_ssl_;
+  const bool orig_force_spdy_always_;
+};
+
 class MockHttpStreamFactoryImpl : public HttpStreamFactoryImpl {
  public:
-  MockHttpStreamFactoryImpl(HttpNetworkSession* session)
-      : HttpStreamFactoryImpl(session),
+  MockHttpStreamFactoryImpl(HttpNetworkSession* session,
+                            bool for_websocket)
+      : HttpStreamFactoryImpl(session, for_websocket),
         preconnect_done_(false),
         waiting_for_preconnect_(false) {}
 
@@ -78,6 +102,16 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate {
     used_ssl_config_ = used_ssl_config;
   }
 
+  virtual void OnWebSocketStreamReady(
+      const SSLConfig& used_ssl_config,
+      const ProxyInfo& used_proxy_info,
+      WebSocketStreamBase* stream) OVERRIDE {
+    stream_done_ = true;
+    if (waiting_for_stream_)
+      MessageLoop::current()->Quit();
+    websocket_stream_.reset(stream);
+  }
+
   virtual void OnStreamFailed(
       int status,
       const SSLConfig& used_ssl_config) OVERRIDE {}
@@ -116,16 +150,59 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate {
     return stream_.get();
   }
 
+  WebSocketStreamBase* websocket_stream() {
+    return websocket_stream_.get();
+  }
+
+  bool stream_done() const { return stream_done_; }
+  SpdySession* spdy_session() {return spdy_session_.get(); }
+  ClientSocketHandle* connection() { return connection_.get(); }
 
  private:
   bool waiting_for_stream_;
   bool stream_done_;
   scoped_ptr<HttpStreamBase> stream_;
+  scoped_ptr<WebSocketStreamBase> websocket_stream_;
   SSLConfig used_ssl_config_;
+  scoped_ptr<ClientSocketHandle> connection_;
+  scoped_refptr<SpdySession> spdy_session_;
 
   DISALLOW_COPY_AND_ASSIGN(StreamRequestWaiter);
 };
 
+class WebSocketSpdyStream : public WebSocketStreamBase {
+ public:
+  explicit WebSocketSpdyStream(SpdySession* spdy_session):
+      WebSocketStreamBase(kStreamTypeSpdy), spdy_session_(spdy_session) {}
+  SpdySession* spdy_session() {return spdy_session_.get();}
+
+ private:
+  scoped_refptr<SpdySession> spdy_session_;
+};
+
+class WebSocketBasicStream : public WebSocketStreamBase {
+ public:
+  explicit WebSocketBasicStream(ClientSocketHandle* connection):
+      WebSocketStreamBase(kStreamTypeBasic), connection_(connection) {}
+  ClientSocketHandle* connection() {return connection_.get();}
+
+ private:
+  scoped_ptr<ClientSocketHandle> connection_;
+};
+
+class WebSocketStreamFactory : public WebSocketStreamBase::Factory {
+ public:
+  virtual WebSocketStreamBase* CreateBasicStream(ClientSocketHandle* connection,
+                                                 bool using_proxy) OVERRIDE {
+    return new WebSocketBasicStream(connection);
+  }
+  virtual WebSocketStreamBase* CreateSpdyStream(
+      SpdySession* spdy_session,
+      bool use_relative_url) OVERRIDE {
+    return new WebSocketSpdyStream(spdy_session);
+  }
+};
+
 struct SessionDependencies {
   // Custom proxy service dependency.
   explicit SessionDependencies(ProxyService* proxy_service)
@@ -178,7 +255,7 @@ void PreconnectHelperForURL(int num_streams,
                             HttpNetworkSession* session) {
   HttpNetworkSessionPeer peer(session);
   MockHttpStreamFactoryImpl* mock_factory =
-      new MockHttpStreamFactoryImpl(session);
+      new MockHttpStreamFactoryImpl(session, false);
   peer.SetHttpStreamFactory(mock_factory);
   SSLConfig ssl_config;
   session->ssl_config_service()->GetSSLConfig(&ssl_config);
@@ -460,8 +537,7 @@ TEST(HttpStreamFactoryTest, JobNotifiesProxy) {
 
   scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
 
-  // Now request a stream.  It should succeed using the second proxy in the
-  // list.
+  // Now request a stream.
   HttpRequestInfo request_info;
   request_info.method = "GET";
   request_info.url = GURL("http://www.google.com");
@@ -610,6 +686,187 @@ TEST(HttpStreamFactoryTest, GetLoadState) {
   waiter.WaitForStream();
 }
 
+TEST(HttpStreamFactoryTest, RequestStream) {
+  SessionDependencies session_deps(ProxyService::CreateDirect());
+
+  StaticSocketDataProvider socket_data;
+  socket_data.set_connect_data(MockConnect(ASYNC, OK));
+  session_deps.socket_factory.AddSocketDataProvider(&socket_data);
+
+  scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
+
+  // Now request a stream.  It should succeed using the second proxy in the
+  // list.
+  HttpRequestInfo request_info;
+  request_info.method = "GET";
+  request_info.url = GURL("http://www.google.com");
+  request_info.load_flags = 0;
+
+  SSLConfig ssl_config;
+  StreamRequestWaiter waiter;
+  scoped_ptr<HttpStreamRequest> request(
+      session->http_stream_factory()->RequestStream(
+          request_info,
+          DEFAULT_PRIORITY,
+          ssl_config,
+          ssl_config,
+          &waiter,
+          BoundNetLog()));
+  waiter.WaitForStream();
+  EXPECT_TRUE(waiter.stream_done());
+  EXPECT_TRUE(NULL == waiter.spdy_session());
+  EXPECT_TRUE(NULL == waiter.connection());
+  EXPECT_TRUE(NULL != waiter.stream());
+}
+
+TEST(HttpStreamFactoryTest, RequestWebSocketBasicStream) {

[mmenke, 2013/05/24 14:53:22]

These tests should make sure the socket was created in the right socket pool.

Should probably also have proxy tests, to make sure the right socket pools are
used.

[yhirano, 2013/05/27 09:21:32]

Done.
Since net::InitSocketHandleForHttp is responsible for the pool selection, we
only check parameters for the function.
I may modify InitSocketHandleForHttp parameters in a future CL.

+  SessionDependencies session_deps(ProxyService::CreateDirect());
+
+  StaticSocketDataProvider socket_data;
+  socket_data.set_connect_data(MockConnect(ASYNC, OK));
+  session_deps.socket_factory.AddSocketDataProvider(&socket_data);
+
+  scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
+
+  // Now request a stream.
+  HttpRequestInfo request_info;
+  request_info.method = "GET";
+  request_info.url = GURL("ws://www.google.com");
+  request_info.load_flags = 0;
+
+  SSLConfig ssl_config;
+  StreamRequestWaiter waiter;
+  WebSocketStreamFactory factory;
+  scoped_ptr<HttpStreamRequest> request(
+      session->websocket_stream_factory()->RequestWebSocketStream(
+          request_info,
+          DEFAULT_PRIORITY,
+          ssl_config,
+          ssl_config,
+          &waiter,
+          &factory,
+          BoundNetLog()));
+  waiter.WaitForStream();
+  EXPECT_TRUE(waiter.stream_done());
+  EXPECT_TRUE(NULL == waiter.stream());
+  EXPECT_TRUE(NULL != waiter.websocket_stream());
+  EXPECT_EQ(WebSocketStreamBase::kStreamTypeBasic,
+            waiter.websocket_stream()->type());
+}
+
+TEST(HttpStreamFactoryTest, RequestSpdyHttpStream) {
+  ScopedForceSpdySsl use_spdy;
+  SpdySessionDependencies session_deps(kProtoSPDY3,
+                                       ProxyService::CreateDirect());
+
+  MockRead mock_read(ASYNC, OK);
+  StaticSocketDataProvider socket_data(&mock_read, 1, NULL, 0);
+  socket_data.set_connect_data(MockConnect(ASYNC, OK));
+  session_deps.socket_factory->AddSocketDataProvider(&socket_data);
+
+  SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
+  ssl_socket_data.protocol_negotiated = kProtoSPDY3;
+  session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
+
+  HostPortPair host_port_pair("www.google.com", 80);
+  scoped_refptr<HttpNetworkSession>
+      session(SpdySessionDependencies::SpdyCreateSession(&session_deps));
+
+  // Now request a stream.
+  HttpRequestInfo request_info;
+  request_info.method = "GET";
+  request_info.url = GURL("http://www.google.com");
+  request_info.load_flags = 0;
+
+  SSLConfig ssl_config;
+  StreamRequestWaiter waiter;
+  scoped_ptr<HttpStreamRequest> request(
+      session->http_stream_factory()->RequestStream(
+          request_info,
+          DEFAULT_PRIORITY,
+          ssl_config,
+          ssl_config,
+          &waiter,
+          BoundNetLog()));
+  waiter.WaitForStream();
+  EXPECT_TRUE(waiter.stream_done());
+  EXPECT_TRUE(NULL == waiter.websocket_stream());
+  EXPECT_TRUE(NULL != waiter.stream());
+  EXPECT_TRUE(waiter.stream()->IsSpdyHttpStream());
+}
+
+TEST(HttpStreamFactoryTest, RequestWebSocketSpdyStream) {
+  ScopedForceSpdySsl use_spdy;
+  SpdySessionDependencies session_deps(kProtoSPDY3,
+                                       ProxyService::CreateDirect());
+
+  MockRead mock_read(ASYNC, ERR_IO_PENDING);
+  StaticSocketDataProvider socket_data(&mock_read, 1, NULL, 0);
+  socket_data.set_connect_data(MockConnect(ASYNC, OK));
+  session_deps.socket_factory->AddSocketDataProvider(&socket_data);
+
+  SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
+  ssl_socket_data.protocol_negotiated = kProtoSPDY3;
+  session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
+
+  SSLSocketDataProvider ssl_socket_data2(ASYNC, OK);
+  ssl_socket_data2.protocol_negotiated = kProtoSPDY3;
+  session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data2);
+
+  HostPortPair host_port_pair("www.google.com", 80);
+  scoped_refptr<HttpNetworkSession>
+      session(SpdySessionDependencies::SpdyCreateSession(&session_deps));
+
+  // Now request a stream.
+  HttpRequestInfo request_info;
+  request_info.method = "GET";
+  request_info.url = GURL("wss://www.google.com");
+  request_info.load_flags = 0;
+
+  SSLConfig ssl_config;
+  StreamRequestWaiter waiter1;
+  WebSocketStreamFactory factory;
+  scoped_ptr<HttpStreamRequest> request1(
+      session->websocket_stream_factory()->RequestWebSocketStream(
+          request_info,
+          DEFAULT_PRIORITY,
+          ssl_config,
+          ssl_config,
+          &waiter1,
+          &factory,
+          BoundNetLog()));
+  waiter1.WaitForStream();
+  EXPECT_TRUE(waiter1.stream_done());
+  EXPECT_TRUE(NULL != waiter1.websocket_stream());
+  EXPECT_EQ(WebSocketStreamBase::kStreamTypeSpdy,
+            waiter1.websocket_stream()->type());
+  EXPECT_TRUE(NULL == waiter1.connection());
+  EXPECT_TRUE(NULL == waiter1.stream());
+
+  StreamRequestWaiter waiter2;
+  scoped_ptr<HttpStreamRequest> request2(
+      session->websocket_stream_factory()->RequestWebSocketStream(
+          request_info,
+          DEFAULT_PRIORITY,
+          ssl_config,
+          ssl_config,
+          &waiter2,
+          &factory,
+          BoundNetLog()));
+  waiter2.WaitForStream();
+  EXPECT_TRUE(waiter2.stream_done());
+  EXPECT_TRUE(NULL != waiter2.websocket_stream());
+  EXPECT_EQ(WebSocketStreamBase::kStreamTypeSpdy,
+            waiter2.websocket_stream()->type());
+  EXPECT_TRUE(NULL == waiter2.connection());
+  EXPECT_TRUE(NULL == waiter2.stream());
+  EXPECT_NE(waiter2.websocket_stream(), waiter1.websocket_stream());
+  EXPECT_EQ(static_cast<WebSocketSpdyStream*>(waiter2.websocket_stream())->
+            spdy_session(),
+            static_cast<WebSocketSpdyStream*>(waiter1.websocket_stream())->
+            spdy_session());
+}
+
 }  // namespace
 
 }  // namespace net