diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-16 04:53:25 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-16 04:53:25 +0000 |
| commit | f1e97e93f49bc2e6b76c7312e87fad2246a1703e (patch) | |
| tree | 6063fdf12b2df57ebcb8002ef0d6c979c189e470 /net/http/http_network_session.cc | |
| parent | f117a4cc7c6cae265071109a9133ff5f853a06f1 (diff) | |
| download | chromium_src-f1e97e93f49bc2e6b76c7312e87fad2246a1703e.zip chromium_src-f1e97e93f49bc2e6b76c7312e87fad2246a1703e.tar.gz chromium_src-f1e97e93f49bc2e6b76c7312e87fad2246a1703e.tar.bz2 | |
Integrating the QuicStreamFactory into the network stack.
Fix static initialized in quic_utils.cc
Reverted: 173321
Initially landed: 173311
Review URL: https://chromiumcodereview.appspot.com/11416058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_session.cc')
| -rw-r--r-- | net/http/http_network_session.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc index daace43..dfc6d95 100644 --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/debug/stack_trace.h" #include "base/logging.h" +#include "base/rand_util.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/values.h" @@ -17,6 +18,8 @@ #include "net/http/http_stream_factory_impl.h" #include "net/http/url_security_manager.h" #include "net/proxy/proxy_service.h" +#include "net/quic/quic_clock.h" +#include "net/quic/quic_stream_factory.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_pool_manager_impl.h" #include "net/socket/next_proto.h" @@ -76,7 +79,8 @@ HttpNetworkSession::Params::Params() spdy_initial_recv_window_size(0), spdy_initial_max_concurrent_streams(0), spdy_max_concurrent_streams_limit(0), - time_func(&base::TimeTicks::Now) { + time_func(&base::TimeTicks::Now), + origin_port_to_force_quic_on(0) { } // TODO(mbelshe): Move the socket factories into HttpStreamFactory. @@ -93,6 +97,10 @@ HttpNetworkSession::HttpNetworkSession(const Params& params) CreateSocketPoolManager(NORMAL_SOCKET_POOL, params)), websocket_socket_pool_manager_( CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)), + quic_stream_factory_(params.host_resolver, + net::ClientSocketFactory::GetDefaultFactory(), + base::Bind(&base::RandUint64), + new QuicClock()), spdy_session_pool_(params.host_resolver, params.ssl_config_service, params.http_server_properties, |