summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_session.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-25 18:31:05 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-25 18:31:05 +0000
commit9d9e7939cc8eb945dd8830afdc62f20842822880 (patch)
tree737bd98c65a4e5cbd28450b7328a1157c364852e /net/http/http_network_session.cc
parent4172b0844fa61f550d1807afa0fb1a7a70d3215e (diff)
downloadchromium_src-9d9e7939cc8eb945dd8830afdc62f20842822880.zip
chromium_src-9d9e7939cc8eb945dd8830afdc62f20842822880.tar.gz
chromium_src-9d9e7939cc8eb945dd8830afdc62f20842822880.tar.bz2
Remove the --use-spdy-over-quic command line option. Always use SPDY over QUIC.
Review URL: https://chromiumcodereview.appspot.com/12326073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_session.cc')
-rw-r--r--net/http/http_network_session.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 2cc9e49..72c6b55 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -82,7 +82,6 @@ HttpNetworkSession::Params::Params()
time_func(&base::TimeTicks::Now),
enable_quic(false),
origin_port_to_force_quic_on(0),
- use_spdy_over_quic(false),
quic_clock(NULL),
quic_random(NULL),
enable_user_alternate_protocol_ports(false) {
@@ -109,8 +108,7 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
params.quic_random ? params.quic_random :
QuicRandom::GetInstance(),
params.quic_clock ? params. quic_clock :
- new QuicClock(),
- params.use_spdy_over_quic),
+ new QuicClock()),
spdy_session_pool_(params.host_resolver,
params.ssl_config_service,
params.http_server_properties,
@@ -195,8 +193,6 @@ Value* HttpNetworkSession::QuicInfoToValue() const {
dict->SetBoolean("quic_enabled", params_.enable_quic);
dict->SetInteger("origin_port_to_force_quic_on",
params_.origin_port_to_force_quic_on);
- dict->SetBoolean("use_spdy_over_quic", params_.use_spdy_over_quic);
-
return dict;
}