summaryrefslogtreecommitdiffstats
path: root/content
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 /content
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 'content')
-rw-r--r--content/browser/renderer_host/p2p/socket_host.cc2
-rw-r--r--content/browser/renderer_host/p2p/socket_host_tcp.cc2
-rw-r--r--content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc2
-rw-r--r--content/browser/renderer_host/p2p/socket_host_test_utils.h2
-rw-r--r--content/browser/renderer_host/p2p/socket_host_udp_unittest.cc2
-rw-r--r--content/renderer/p2p/ipc_network_manager.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/renderer_host/p2p/socket_host.cc b/content/browser/renderer_host/p2p/socket_host.cc
index ae77df5..0f07127 100644
--- a/content/browser/renderer_host/p2p/socket_host.cc
+++ b/content/browser/renderer_host/p2p/socket_host.cc
@@ -4,7 +4,7 @@
#include "content/browser/renderer_host/p2p/socket_host.h"
-#include "net/base/sys_byteorder.h"
+#include "base/sys_byteorder.h"
#include "content/browser/renderer_host/p2p/socket_host_tcp.h"
#include "content/browser/renderer_host/p2p/socket_host_tcp_server.h"
#include "content/browser/renderer_host/p2p/socket_host_udp.h"
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc
index db94edc..755cd0d 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -4,11 +4,11 @@
#include "content/browser/renderer_host/p2p/socket_host_tcp.h"
+#include "base/sys_byteorder.h"
#include "content/common/p2p_messages.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
-#include "net/base/sys_byteorder.h"
#include "net/socket/tcp_client_socket.h"
namespace {
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
index 2b88f4a..254b47b 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
@@ -6,8 +6,8 @@
#include <deque>
+#include "base/sys_byteorder.h"
#include "content/browser/renderer_host/p2p/socket_host_test_utils.h"
-#include "net/base/sys_byteorder.h"
#include "net/socket/stream_socket.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/renderer_host/p2p/socket_host_test_utils.h b/content/browser/renderer_host/p2p/socket_host_test_utils.h
index 0ea8c1c..6c3113b 100644
--- a/content/browser/renderer_host/p2p/socket_host_test_utils.h
+++ b/content/browser/renderer_host/p2p/socket_host_test_utils.h
@@ -7,6 +7,7 @@
#include <vector>
+#include "base/sys_byteorder.h"
#include "content/common/p2p_messages.h"
#include "ipc/ipc_message.h"
#include "ipc/ipc_message_utils.h"
@@ -14,7 +15,6 @@
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
-#include "net/base/sys_byteorder.h"
#include "net/socket/stream_socket.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc
index 02cc3b2..b294c78 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc
@@ -7,11 +7,11 @@
#include <deque>
#include <vector>
+#include "base/sys_byteorder.h"
#include "content/browser/renderer_host/p2p/socket_host_test_utils.h"
#include "net/base/io_buffer.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
-#include "net/base/sys_byteorder.h"
#include "net/udp/datagram_server_socket.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc
index 019801b..b999506 100644
--- a/content/renderer/p2p/ipc_network_manager.cc
+++ b/content/renderer/p2p/ipc_network_manager.cc
@@ -5,8 +5,8 @@
#include "content/renderer/p2p/ipc_network_manager.h"
#include "base/bind.h"
+#include "base/sys_byteorder.h"
#include "net/base/net_util.h"
-#include "net/base/sys_byteorder.h"
namespace content {