net/socket/socks5_client_socket.cc - Issue 895853003: Update from https://crrev.com/314320

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

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

Patch Set: Created 5 years, 11 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/socks5_client_socket.cc

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

index b435e1354260534762d07bc915700142725aa8fa..6d67913b6e6c256079f224c9872efa63945044e2 100644

--- a/net/socket/socks5_client_socket.cc

+++ b/net/socket/socks5_client_socket.cc

@@ -7,10 +7,10 @@

#include "base/basictypes.h"

#include "base/callback_helpers.h"

#include "base/compiler_specific.h"

-#include "base/debug/trace_event.h"

#include "base/format_macros.h"

#include "base/strings/string_util.h"

#include "base/sys_byteorder.h"

+#include "base/trace_event/trace_event.h"

#include "net/base/io_buffer.h"

#include "net/base/net_log.h"

#include "net/base/net_util.h"

« no previous file with comments | « net/sdch/README.md ('k') | net/socket/ssl_client_socket.cc » ('j') | no next file with comments »