Integrating the QuicStreamFactory into the network stack.

net/http/http_network_session.h

Index: net/http/http_network_session.h
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index d47b5a49cd07fa9b87e02cde4cf27646a0ffe45f..b519958abd7e39d576f7bbb985a71af08b20fcbc 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -14,6 +14,7 @@
 #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 {
@@ -79,6 +80,7 @@ class NET_EXPORT HttpNetworkSession
     size_t spdy_max_concurrent_streams_limit;
     SpdySessionPool::TimeFunc time_func;
     std::string trusted_spdy_proxy;
+    uint16 force_quic_port;
   };
 
   enum SocketPoolType {
@@ -114,6 +116,7 @@ class NET_EXPORT HttpNetworkSession
   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_;
   }
@@ -174,6 +177,7 @@ class NET_EXPORT HttpNetworkSession
   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_;