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 /chrome/browser/io_thread.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 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 53d184f..65a555f 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -513,6 +513,11 @@ void IOThread::Init() { globals_->testing_fixed_https_port = GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpsPort); } + if (command_line.HasSwitch(switches::kOriginPortToForceQuicOn)) { + globals_->origin_port_to_force_quic_on.set( + GetSwitchValueAsInt(command_line, + switches::kOriginPortToForceQuicOn)); + } InitializeNetworkOptions(command_line); @@ -815,6 +820,8 @@ void IOThread::InitializeNetworkSessionParams( ¶ms->enable_spdy_ping_based_connection_checking); globals_->spdy_default_protocol.CopyToIfSet( ¶ms->spdy_default_protocol); + globals_->origin_port_to_force_quic_on.CopyToIfSet( + ¶ms->origin_port_to_force_quic_on); } net::SSLConfigService* IOThread::GetSSLConfigService() { |