diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-03 21:13:14 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-03 21:13:14 +0000 |
| commit | d412ef7bfd9c6d95a776194df2b6433938442d74 (patch) | |
| tree | 299f17f2652c704d7f28f71ae71fb8c0750a0221 /net/http | |
| parent | b02876a2bc86334ccbbd4dc7fb551cb3a139542d (diff) | |
| download | chromium_src-d412ef7bfd9c6d95a776194df2b6433938442d74.zip chromium_src-d412ef7bfd9c6d95a776194df2b6433938442d74.tar.gz chromium_src-d412ef7bfd9c6d95a776194df2b6433938442d74.tar.bz2 | |
Avoid persisting of QUIC server config information in Stable and Beta
channels.
Will delete this flag once we have implemented clearing of QUIC
server config information from clearing cookies dialog.
r=rch, eroman, sky, jar
Review URL: https://codereview.chromium.org/185083002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_cache.cc | 3 | ||||
| -rw-r--r-- | net/http/http_network_session.cc | 3 | ||||
| -rw-r--r-- | net/http/http_network_session.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index ac9dda5..e4319e1 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -290,7 +290,8 @@ HttpCache::HttpCache(const net::HttpNetworkSession::Params& params, backend_factory_(backend_factory), building_backend_(false), mode_(NORMAL), - quic_server_info_factory_(new QuicServerInfoFactoryAdaptor(this)), + quic_server_info_factory_(params.enable_quic_persist_server_info ? + new QuicServerInfoFactoryAdaptor(this) : NULL), network_layer_(new HttpNetworkLayer(new HttpNetworkSession(params))) { HttpNetworkSession* session = network_layer_->GetSession(); session->quic_stream_factory()->set_quic_server_info_factory( diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc index aa5eedf..73d969c 100644 --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc @@ -83,6 +83,7 @@ HttpNetworkSession::Params::Params() enable_quic_https(false), enable_quic_port_selection(true), enable_quic_pacing(false), + enable_quic_persist_server_info(false), quic_clock(NULL), quic_random(NULL), quic_max_packet_length(kDefaultMaxPacketSize), @@ -206,6 +207,8 @@ base::Value* HttpNetworkSession::QuicInfoToValue() const { params_.enable_quic_port_selection); dict->SetBoolean("enable_quic_pacing", params_.enable_quic_pacing); + dict->SetBoolean("enable_quic_persist_server_info", + params_.enable_quic_persist_server_info); dict->SetString("origin_to_force_quic_on", params_.origin_to_force_quic_on.ToString()); return dict; diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index 1e1635c..ac01487 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -90,6 +90,7 @@ class NET_EXPORT HttpNetworkSession bool enable_quic_https; bool enable_quic_port_selection; bool enable_quic_pacing; + bool enable_quic_persist_server_info; HostPortPair origin_to_force_quic_on; QuicClock* quic_clock; // Will be owned by QuicStreamFactory. QuicRandom* quic_random; |