net/socket/socks_client_socket_unittest.cc - Issue 669813003: Update from chromium https://crrev.com/301725/

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_unittest.cc

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@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/socket/socks_client_socket_unittest.cc

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

index ced7d9e4d07be35e258c734f858c775d0f6093ad..fbb84f8f50ae59c474e8831bd0e611390a5c6659 100644

--- a/net/socket/socks_client_socket_unittest.cc

+++ b/net/socket/socks_client_socket_unittest.cc

@@ -35,7 +35,7 @@ class SOCKSClientSocketTest : public PlatformTest {

HostResolver* host_resolver,

const std::string& hostname, int port,

NetLog* net_log);

- virtual void SetUp();

+ void SetUp() override;

protected:

scoped_ptr<SOCKSClientSocket> user_sock_;

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