diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 01:43:37 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 01:43:37 +0000 |
| commit | 1946d9e6a7c8c8bc9dafc53d3301ecdc4fbcb8bd (patch) | |
| tree | 52bc0a27878e0fb4655ffc320603ef2284bcb9cc /chrome_frame | |
| parent | 53e73914b8220aa660968e63cb15dfcdaa4bcaaf (diff) | |
| download | chromium_src-1946d9e6a7c8c8bc9dafc53d3301ecdc4fbcb8bd.zip chromium_src-1946d9e6a7c8c8bc9dafc53d3301ecdc4fbcb8bd.tar.gz chromium_src-1946d9e6a7c8c8bc9dafc53d3301ecdc4fbcb8bd.tar.bz2 | |
net: move socket files from net/base to net/socket
BUG=70818
Review URL: https://codereview.chromium.org/13812005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/test_server.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/test_server.h | 2 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index 643b8ca..7577e2d 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -16,9 +16,9 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome_frame/test/chrome_frame_test_utils.h" -#include "net/base/tcp_listen_socket.h" #include "net/base/winsock_init.h" #include "net/http/http_util.h" +#include "net/socket/tcp_listen_socket.h" namespace test_server { const char kDefaultHeaderTemplate[] = diff --git a/chrome_frame/test/test_server.h b/chrome_frame/test/test_server.h index 66cf3f9..3cdb88e 100644 --- a/chrome_frame/test/test_server.h +++ b/chrome_frame/test/test_server.h @@ -42,7 +42,7 @@ #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" #include "base/message_loop.h" -#include "net/base/stream_listen_socket.h" +#include "net/socket/stream_listen_socket.h" namespace test_server { diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index ecb01a7..905be34 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -15,18 +15,18 @@ #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" #include "chrome/common/chrome_switches.h" -#include "chrome/installer/util/product.h" -#include "chrome/installer/util/install_util.h" #include "chrome/installer/util/helper.h" +#include "chrome/installer/util/install_util.h" +#include "chrome/installer/util/product.h" #include "chrome_frame/html_utils.h" -#include "chrome_frame/utils.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/mock_ie_event_sink_actions.h" #include "chrome_frame/test/mock_ie_event_sink_test.h" #include "chrome_frame/test/test_scrubber.h" +#include "chrome_frame/utils.h" #include "net/base/mime_util.h" -#include "net/base/stream_listen_socket.h" #include "net/http/http_util.h" +#include "net/socket/stream_listen_socket.h" using chrome_frame_test::kChromeFrameLongNavigationTimeout; using chrome_frame_test::kChromeFrameVeryLongNavigationTimeout; |