diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 01:40:53 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 01:40:53 +0000 |
| commit | f2cb3cf86e4217581443d93e863c891a05066e60 (patch) | |
| tree | c62110d2347d17e1b1a1f57fa758cf8bba72548b /net/spdy | |
| parent | b8512263f9556ac705394e9da03d364980f0eadf (diff) | |
| download | chromium_src-f2cb3cf86e4217581443d93e863c891a05066e60.zip chromium_src-f2cb3cf86e4217581443d93e863c891a05066e60.tar.gz chromium_src-f2cb3cf86e4217581443d93e863c891a05066e60.tar.bz2 | |
net: move host_resolver files from net/base to net/dns
BUG=70818
Review URL: https://codereview.chromium.org/12518036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc | 8 | ||||
| -rw-r--r-- | net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc | 8 | ||||
| -rw-r--r-- | net/spdy/spdy_test_util_spdy2.h | 2 | ||||
| -rw-r--r-- | net/spdy/spdy_test_util_spdy3.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc index b98c9df..d6117ab 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; diff --git a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc index 85db660..5dac149 100644 --- a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc +++ b/net/spdy/spdy_proxy_client_socket_spdy3_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_spdy3.h" -#include "testing/platform_test.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/platform_test.h" using namespace net::test_spdy3; diff --git a/net/spdy/spdy_test_util_spdy2.h b/net/spdy/spdy_test_util_spdy2.h index 4d47b02..6054c38 100644 --- a/net/spdy/spdy_test_util_spdy2.h +++ b/net/spdy/spdy_test_util_spdy2.h @@ -10,8 +10,8 @@ #include "base/string_piece.h" #include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" -#include "net/base/mock_host_resolver.h" #include "net/base/request_priority.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" diff --git a/net/spdy/spdy_test_util_spdy3.h b/net/spdy/spdy_test_util_spdy3.h index dec5c05..27c8670 100644 --- a/net/spdy/spdy_test_util_spdy3.h +++ b/net/spdy/spdy_test_util_spdy3.h @@ -12,8 +12,8 @@ #include "crypto/ec_signature_creator.h" #include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" -#include "net/base/mock_host_resolver.h" #include "net/base/request_priority.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" |