summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_session.cc
diff options
context:
space:
mode:
authorrtenneti <rtenneti@chromium.org>2016-03-21 13:26:57 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-21 20:27:47 +0000
commit8a2f463d3726f944f5ec279664b25118fd3ccf3c (patch)
tree9c2f8731b7618b5bb03dfce1f105e7f53a35dcda /net/http/http_network_session.cc
parentc96b751d4f1c02151b5e705d1fb216b06a864893 (diff)
downloadchromium_src-8a2f463d3726f944f5ec279664b25118fd3ccf3c.zip
chromium_src-8a2f463d3726f944f5ec279664b25118fd3ccf3c.tar.gz
chromium_src-8a2f463d3726f944f5ec279664b25118fd3ccf3c.tar.bz2
QUIC - extend origin-to-force-quic-on command line option to accept list
of host_ports for which QUIC will be forced. A TCP job wouldn't even be started for these origins. R=rch@chromium.org, eroman@chromium.org, Review URL: https://codereview.chromium.org/1808303005 Cr-Commit-Position: refs/heads/master@{#382370}
Diffstat (limited to 'net/http/http_network_session.cc')
-rw-r--r--net/http/http_network_session.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 053509a..748f27e 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -317,8 +317,13 @@ scoped_ptr<base::Value> HttpNetworkSession::QuicInfoToValue() const {
connection_options->AppendString("'" + QuicUtils::TagToString(*it) + "'");
}
dict->Set("connection_options", std::move(connection_options));
- dict->SetString("origin_to_force_quic_on",
- params_.origin_to_force_quic_on.ToString());
+
+ scoped_ptr<base::ListValue> origins_to_force_quic_on(new base::ListValue);
+ for (const auto& origin : params_.origins_to_force_quic_on) {
+ origins_to_force_quic_on->AppendString("'" + origin.ToString() + "'");
+ }
+ dict->Set("origins_to_force_quic_on", std::move(origins_to_force_quic_on));
+
dict->SetDouble("load_server_info_timeout_srtt_multiplier",
params_.quic_load_server_info_timeout_srtt_multiplier);
dict->SetBoolean("enable_connection_racing",