summaryrefslogtreecommitdiffstats
path: root/net/server
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 01:43:37 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 01:43:37 +0000
commit1946d9e6a7c8c8bc9dafc53d3301ecdc4fbcb8bd (patch)
tree52bc0a27878e0fb4655ffc320603ef2284bcb9cc /net/server
parent53e73914b8220aa660968e63cb15dfcdaa4bcaaf (diff)
downloadchromium_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 'net/server')
-rw-r--r--net/server/http_connection.cc2
-rw-r--r--net/server/http_server.cc2
-rw-r--r--net/server/http_server.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/server/http_connection.cc b/net/server/http_connection.cc
index e82c9fe..2bc9d4d 100644
--- a/net/server/http_connection.cc
+++ b/net/server/http_connection.cc
@@ -6,9 +6,9 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "net/base/stream_listen_socket.h"
#include "net/server/http_server.h"
#include "net/server/web_socket.h"
+#include "net/socket/stream_listen_socket.h"
namespace net {
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index b92c211..4f1fb08 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -11,10 +11,10 @@
#include "base/stringprintf.h"
#include "base/sys_byteorder.h"
#include "build/build_config.h"
-#include "net/base/tcp_listen_socket.h"
#include "net/server/http_connection.h"
#include "net/server/http_server_request_info.h"
#include "net/server/web_socket.h"
+#include "net/socket/tcp_listen_socket.h"
namespace net {
diff --git a/net/server/http_server.h b/net/server/http_server.h
index 54773ad..b5ba037 100644
--- a/net/server/http_server.h
+++ b/net/server/http_server.h
@@ -10,8 +10,8 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "net/base/stream_listen_socket.h"
#include "net/http/http_status_code.h"
+#include "net/socket/stream_listen_socket.h"
namespace net {