Integrating the QuicStreamFactory into the network stack.

net/http/http_network_session.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
 
 #include <set>
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_export.h"
 #include "net/base/ssl_client_auth_cache.h"
 #include "net/http/http_auth_cache.h"
 #include "net/http/http_stream_factory.h"
+#include "net/quic/quic_stream_factory.h"
 #include "net/spdy/spdy_session_pool.h"
 
 namespace base {
 class Value;
 }
 
 namespace net {
 
 class CertVerifier;
 class ClientSocketFactory;
@@ skipping 45 matching lines @@
     bool enable_spdy_ip_pooling;
     bool enable_spdy_credential_frames;
     bool enable_spdy_compression;
     bool enable_spdy_ping_based_connection_checking;
     NextProto spdy_default_protocol;
     size_t spdy_initial_recv_window_size;
     size_t spdy_initial_max_concurrent_streams;
     size_t spdy_max_concurrent_streams_limit;
     SpdySessionPool::TimeFunc time_func;
     std::string trusted_spdy_proxy;
+    uint16 force_quic_port;
   };
 
   enum SocketPoolType {
     NORMAL_SOCKET_POOL,
     WEBSOCKET_SOCKET_POOL,
     NUM_SOCKET_POOL_TYPES
   };
 
   explicit HttpNetworkSession(const Params& params);
 
@@ skipping 15 matching lines @@
       SocketPoolType pool_type,
       const HostPortPair& http_proxy);
   SSLClientSocketPool* GetSocketPoolForSSLWithProxy(
       SocketPoolType pool_type,
       const HostPortPair& proxy_server);
 
   CertVerifier* cert_verifier() { return cert_verifier_; }
   ProxyService* proxy_service() { return proxy_service_; }
   SSLConfigService* ssl_config_service() { return ssl_config_service_; }
   SpdySessionPool* spdy_session_pool() { return &spdy_session_pool_; }
+  QuicStreamFactory* quic_stream_factory() { return &quic_stream_factory_; }
   HttpAuthHandlerFactory* http_auth_handler_factory() {
     return http_auth_handler_factory_;
   }
   NetworkDelegate* network_delegate() {
     return network_delegate_;
   }
   HttpServerProperties* http_server_properties() {
     return http_server_properties_;
   }
   HttpStreamFactory* http_stream_factory() {
@@ skipping 40 matching lines @@
 
   // Not const since it's modified by HttpNetworkSessionPeer for testing.
   ProxyService* proxy_service_;
   const scoped_refptr<SSLConfigService> ssl_config_service_;
 
   HttpAuthCache http_auth_cache_;
   SSLClientAuthCache ssl_client_auth_cache_;
   scoped_ptr<ClientSocketPoolManager> normal_socket_pool_manager_;
   scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_;
   SpdySessionPool spdy_session_pool_;
+  QuicStreamFactory quic_stream_factory_;

[willchan no longer on Chromium, 2012/12/11 02:02:08]

This needs to be one above the SpdySessionPool. The reason is because you could
imagine chromium<=>quicproxy that has a stream over which we do a quic connect
to an endpoint, and then over that quic bytestream we do TLS-NPN=>SPDY.
Therefore, SPDY sits on top of quic, so we need to make sure the SPDY stuff gets
created after and destroyed before quic. Therefore, quic_stream_factory_ must be
before spdy_session_pool_.

[Ryan Hamilton, 2012/12/11 20:03:05]

Done.

   scoped_ptr<HttpStreamFactory> http_stream_factory_;
   std::set<HttpResponseBodyDrainer*> response_drainers_;
 
   Params params_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_NETWORK_SESSION_H_