Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index 48fff7ce1b98f19df083aa38e83cccc8569e449d..f2d7d3eab932e06ae6de83fb6c3ba35212a77892 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -640,6 +640,11 @@ void IOThread::Init() { |
command_line.HasSwitch(switches::kEnableTcpFastOpen); |
net::CheckSupportAndMaybeEnableTCPFastOpen(always_enable_tfo_if_supported); |
+ globals_->http_network_session_dynamic_shared_params.reset( |
Bence
2016/12/20 14:58:07
Please consider assigning to base::MakeUnique<>()
pmarko
2016/12/20 18:00:37
Done.
|
+ new net::HttpNetworkSession::DynamicSharedParams()); |
+ params_.dynamic_shared_params = |
+ globals_->http_network_session_dynamic_shared_params.get(); |
+ |
ConfigureParamsFromFieldTrialsAndCommandLine( |
command_line, is_quic_allowed_by_policy_, |
http_09_on_non_default_ports_enabled_, ¶ms_); |
@@ -948,7 +953,7 @@ void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine( |
if (command_line.HasSwitch(switches::kDisableHttp2)) |
params->enable_http2 = false; |
- if (params->enable_quic) { |
+ if (params->enable_quic()) { |
if (command_line.HasSwitch(switches::kQuicConnectionOptions)) { |
params->quic_connection_options = |
net::QuicUtils::ParseQuicConnectionOptions( |