net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc - Issue 12518036: net: move host_resolver files from net/base to net/dns

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/spdy/spdy_proxy_client_socket_spdy2_unittest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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/spdy/spdy_proxy_client_socket_spdy2_unittest.cc

diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc

index b98c9df6befdd52823f96fd3ac004b61627711cd..d6117ab8c72e25d36a07a3e39828c4ab58f5a3db 100644

--- a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc

+++ b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc

@@ -11,22 +11,22 @@

#include "net/base/capturing_net_log.h"

#include "net/base/net_log.h"

#include "net/base/net_log_unittest.h"

-#include "net/base/mock_host_resolver.h"

#include "net/base/test_completion_callback.h"

#include "net/base/winsock_init.h"

-#include "net/http/http_response_info.h"

+#include "net/dns/mock_host_resolver.h"

#include "net/http/http_response_headers.h"

+#include "net/http/http_response_info.h"

#include "net/socket/client_socket_factory.h"

-#include "net/socket/tcp_client_socket.h"

#include "net/socket/socket_test_util.h"

+#include "net/socket/tcp_client_socket.h"

#include "net/spdy/buffered_spdy_framer.h"

#include "net/spdy/spdy_http_utils.h"

#include "net/spdy/spdy_protocol.h"

#include "net/spdy/spdy_session_pool.h"

#include "net/spdy/spdy_test_util_common.h"

#include "net/spdy/spdy_test_util_spdy2.h"

-#include "testing/platform_test.h"

#include "testing/gtest/include/gtest/gtest.h"

+#include "testing/platform_test.h"

using namespace net::test_spdy2;