Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: net/http/http_network_session.cc

Issue 12326073: Remove the --use-spdy-over-quic command line option. Always use SPDY over QUIC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_session.h ('k') | net/quic/quic_http_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_session.cc
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 2cc9e494a5c13f68b3c00a90af84686879c2f154..72c6b55e6db9d354df5e5e75acbb4772e8916d12 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;
}
« no previous file with comments | « net/http/http_network_session.h ('k') | net/quic/quic_http_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698