summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-28 23:18:21 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-28 23:18:21 +0000
commit0e6f619c41f85776a963a2bfb587ad64675554c4 (patch)
treedff81415834875ce943e6e4af882d676497d971b /net/socket
parentdfa08b04cf8ee5a34972379f254061647313e2f0 (diff)
downloadchromium_src-0e6f619c41f85776a963a2bfb587ad64675554c4.zip
chromium_src-0e6f619c41f85776a963a2bfb587ad64675554c4.tar.gz
chromium_src-0e6f619c41f85776a963a2bfb587ad64675554c4.tar.bz2
Move net/base/sys_byteorder.h to base/sys_byteorder.h
Two motivations: (1) There are currently clients in src/crypto that need the same logic. (2) There is soon to be a client in src/chrome/common that needs the 64-bit version of this logic, which is currently inlined in a src/crypto implementation file. BUG=103480 TEST=compiles Review URL: http://codereview.chromium.org/8949026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/web_socket_server_socket.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/socket/web_socket_server_socket.cc b/net/socket/web_socket_server_socket.cc
index b86ac32..add4a55 100644
--- a/net/socket/web_socket_server_socket.cc
+++ b/net/socket/web_socket_server_socket.cc
@@ -10,12 +10,6 @@
#include <map>
#include <vector>
-#if defined(OS_WIN)
-#include <winsock2.h> // for htonl
-#else
-#include <arpa/inet.h>
-#endif
-
#include "base/basictypes.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -26,6 +20,7 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/sys_byteorder.h"
#include "googleurl/src/gurl.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"