net/socket/socks_client_socket_pool.cc - Issue 903273002: Update from https://crrev.com/315085

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/socks_client_socket_pool.cc

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

Patch Set: Created 5 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:

Index: net/socket/socks_client_socket_pool.cc

diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc

index e11b7a48db5b6f8e8ed21823d2afdd718a473c8d..e431227571f517ef16daa383b2ef3f0d0b581b93 100644

--- a/net/socket/socks_client_socket_pool.cc

+++ b/net/socket/socks_client_socket_pool.cc

@@ -76,6 +76,9 @@ LoadState SOCKSConnectJob::GetLoadState() const {

}

void SOCKSConnectJob::OnIOComplete(int result) {

+ // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed.

+ tracked_objects::ScopedTracker tracking_profile(

+ FROM_HERE_WITH_EXPLICIT_FUNCTION("455884 SOCKSConnectJob::OnIOComplete"));

int rv = DoLoop(result);

if (rv != ERR_IO_PENDING)

NotifyDelegateOfCompletion(rv); // Deletes |this|

« no previous file with comments | « net/socket/client_socket_pool_base.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »