diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 23:18:21 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 23:18:21 +0000 |
| commit | 0e6f619c41f85776a963a2bfb587ad64675554c4 (patch) | |
| tree | dff81415834875ce943e6e4af882d676497d971b /jingle | |
| parent | dfa08b04cf8ee5a34972379f254061647313e2f0 (diff) | |
| download | chromium_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 'jingle')
| -rw-r--r-- | jingle/notifier/base/chrome_async_socket_unittest.cc | 7 | ||||
| -rw-r--r-- | jingle/notifier/communicator/xmpp_connection_generator.cc | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc index e9ce73c..a86b5c8 100644 --- a/jingle/notifier/base/chrome_async_socket_unittest.cc +++ b/jingle/notifier/base/chrome_async_socket_unittest.cc @@ -4,12 +4,6 @@ #include "jingle/notifier/base/chrome_async_socket.h" -#if defined(OS_WIN) -#include <winsock2.h> -#elif defined(OS_POSIX) -#include <arpa/inet.h> -#endif - #include <deque> #include <string> @@ -17,6 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/sys_byteorder.h" #include "jingle/notifier/base/resolving_client_socket_factory.h" #include "net/base/cert_verifier.h" #include "net/base/net_errors.h" diff --git a/jingle/notifier/communicator/xmpp_connection_generator.cc b/jingle/notifier/communicator/xmpp_connection_generator.cc index b19d16b..3a05d9c 100644 --- a/jingle/notifier/communicator/xmpp_connection_generator.cc +++ b/jingle/notifier/communicator/xmpp_connection_generator.cc @@ -12,18 +12,13 @@ #include "jingle/notifier/communicator/xmpp_connection_generator.h" -#if defined(OS_WIN) -#include <winsock2.h> -#elif defined(OS_POSIX) -#include <arpa/inet.h> -#endif - #include <vector> #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/sys_byteorder.h" #include "jingle/notifier/base/server_information.h" #include "jingle/notifier/communicator/connection_options.h" #include "jingle/notifier/communicator/connection_settings.h" |