net/http/http_server_properties_manager_unittest.cc - Issue 681713002: Update from chromium https://crrev.com/301315

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_server_properties_manager_unittest.cc

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 6 years, 2 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:

Index: net/http/http_server_properties_manager_unittest.cc

diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc

index dbbfc2d01ff4d3f9b27807710d0ff04e5406035b..fcc253eb84377472176fefd2dacb40a7876d1b8a 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,

« no previous file with comments | « net/http/http_server_properties_manager.cc ('k') | net/http/http_stream_factory_impl.cc » ('j') | no next file with comments »