net/socket/client_socket_pool_base.h - Issue 822713002: Update from https://crrev.com/309415

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/socket/client_socket_pool_base.h

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

Patch Set: Created 6 years 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/socket/client_socket_pool_base.h

diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h

index ec4e33cc0edf33dd90a0d234d51edea58cb6362b..a7dcbf5263d520be60b4ab291265d9479da10faa 100644

--- a/net/socket/client_socket_pool_base.h

+++ b/net/socket/client_socket_pool_base.h

@@ -859,7 +859,7 @@ class ClientSocketPoolBase {

group_name, casted_request, delegate);

}

- virtual base::TimeDelta ConnectionTimeout() const {

+ base::TimeDelta ConnectionTimeout() const override {

return connect_job_factory_->ConnectionTimeout();

}