summaryrefslogtreecommitdiffstats
path: root/net/http/http_server_properties_manager_unittest.cc
diff options
context:
space:
mode:
authorrtenneti <rtenneti@chromium.org>2014-10-24 00:26:18 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-24 07:26:40 +0000
commit7a6c3e8f4978572660f16b3724c8dbcf0205761c (patch)
treed729a75a5b23bdd0c03ea20c2885d6dd5d7a21ef /net/http/http_server_properties_manager_unittest.cc
parentdf17802a065102ff635313baf8586df83d9e1799 (diff)
downloadchromium_src-7a6c3e8f4978572660f16b3724c8dbcf0205761c.zip
chromium_src-7a6c3e8f4978572660f16b3724c8dbcf0205761c.tar.gz
chromium_src-7a6c3e8f4978572660f16b3724c8dbcf0205761c.tar.bz2
QUIC - Always pesist 1000 MRU alternate protocols to preferences file.
Deleted the experiment to load either 200 or 1000 servers from disk. + Obsoleted the following histograms ++ Net.AlternateProtocolUsage.200Truncated ++ Net.AlternateProtocolUsage.1000Truncated Reverted the changes related to the above from the following CL: https://codereview.chromium.org/298683010/ R=jar@chromium.org, rch@chromium.org Review URL: https://codereview.chromium.org/675783005 Cr-Commit-Position: refs/heads/master@{#301070}
Diffstat (limited to 'net/http/http_server_properties_manager_unittest.cc')
-rw-r--r--net/http/http_server_properties_manager_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc
index dbbfc2d..fcc253e 100644
--- a/net/http/http_server_properties_manager_unittest.cc
+++ b/net/http/http_server_properties_manager_unittest.cc
@@ -67,11 +67,10 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager {
MOCK_METHOD0(UpdateCacheFromPrefsOnPrefThread, void());
MOCK_METHOD1(UpdatePrefsFromCacheOnNetworkThread, void(const base::Closure&));
- MOCK_METHOD6(UpdateCacheFromPrefsOnNetworkThread,
+ MOCK_METHOD5(UpdateCacheFromPrefsOnNetworkThread,
void(std::vector<std::string>* spdy_servers,
net::SpdySettingsMap* spdy_settings_map,
net::AlternateProtocolMap* alternate_protocol_map,
- net::AlternateProtocolExperiment experiment,
net::SupportsQuicMap* supports_quic_map,
bool detected_corrupted_prefs));
MOCK_METHOD4(UpdatePrefsOnPref,