Changes to HttpNetworkTransaction for WebSocket Handshake

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 254 matching lines @@
   virtual ~WebSocketBasicHandshakeStream() {
     connection_->socket()->Disconnect();
   }
 
   ClientSocketHandle* connection() { return connection_.get(); }
 
  private:
   scoped_ptr<ClientSocketHandle> connection_;
 };
 
-class WebSocketStreamFactory : public WebSocketHandshakeStreamBase::Factory {
+class WebSocketHandshakeStreamFactory
+    : public WebSocketHandshakeStreamBase::Factory {
  public:
-  virtual ~WebSocketStreamFactory() {}
+  virtual ~WebSocketHandshakeStreamFactory() {}
 
   virtual WebSocketHandshakeStreamBase* CreateBasicStream(
       ClientSocketHandle* connection,
       bool using_proxy) OVERRIDE {
     return new WebSocketBasicHandshakeStream(connection);
   }
 
   virtual WebSocketHandshakeStreamBase* CreateSpdyStream(
       const base::WeakPtr<SpdySession>& spdy_session,
       bool use_relative_url) OVERRIDE {
@@ skipping 635 matching lines @@
       SpdySessionDependencies::SpdyCreateSession(&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;
+  WebSocketHandshakeStreamFactory factory;
   scoped_ptr<HttpStreamRequest> request(
       session->websocket_handshake_stream_factory()
           ->RequestWebSocketHandshakeStream(request_info,
                                             DEFAULT_PRIORITY,
                                             ssl_config,
                                             ssl_config,
                                             &waiter,
                                             &factory,
                                             BoundNetLog()));
   waiter.WaitForStream();
@@ skipping 30 matching lines @@
       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 waiter;
-  WebSocketStreamFactory factory;
+  WebSocketHandshakeStreamFactory factory;
   scoped_ptr<HttpStreamRequest> request(
       session->websocket_handshake_stream_factory()
           ->RequestWebSocketHandshakeStream(request_info,
                                             DEFAULT_PRIORITY,
                                             ssl_config,
                                             ssl_config,
                                             &waiter,
                                             &factory,
                                             BoundNetLog()));
   waiter.WaitForStream();
@@ skipping 27 matching lines @@
       SpdySessionDependencies::SpdyCreateSession(&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;
+  WebSocketHandshakeStreamFactory factory;
   scoped_ptr<HttpStreamRequest> request(
       session->websocket_handshake_stream_factory()
           ->RequestWebSocketHandshakeStream(request_info,
                                             DEFAULT_PRIORITY,
                                             ssl_config,
                                             ssl_config,
                                             &waiter,
                                             &factory,
                                             BoundNetLog()));
   waiter.WaitForStream();
@@ skipping 93 matching lines @@
       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;
+  WebSocketHandshakeStreamFactory factory;
   scoped_ptr<HttpStreamRequest> request1(
       session->websocket_handshake_stream_factory()
           ->RequestWebSocketHandshakeStream(request_info,
                                             DEFAULT_PRIORITY,
                                             ssl_config,
                                             ssl_config,
                                             &waiter1,
                                             &factory,
                                             BoundNetLog()));
   waiter1.WaitForStream();
@@ skipping 69 matching lines @@
   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,
       NPN_SPDY_3);
 
   SSLConfig ssl_config;
   StreamRequestWaiter waiter;
-  WebSocketStreamFactory factory;
+  WebSocketHandshakeStreamFactory factory;
   scoped_ptr<HttpStreamRequest> request(
       session->websocket_handshake_stream_factory()
           ->RequestWebSocketHandshakeStream(request_info,
                                             DEFAULT_PRIORITY,
                                             ssl_config,
                                             ssl_config,
                                             &waiter,
                                             &factory,
                                             BoundNetLog()));
   waiter.WaitForStream();
@@ skipping 17 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_handshake_stream_factory())->num_orphaned_jobs());
 }
 
 }  // namespace
 
 }  // namespace net