Minor cleanup: add a sys_addrinfo.h header that hides the platform-specific includes needed for struct addrinfo / struct sockaddr, since we were duplicating that #if #else logic in a growing number of places.

BUG=NONE 
TEST=NONE
Review URL: http://codereview.chromium.org/491038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34399 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 40 insertions, 104 deletions

diff --git a/net/base/address_list.cc b/net/base/address_list.cc
index 3492b3d..7952a75 100644
--- a/net/base/address_list.cc
+++ b/net/base/address_list.cc
@@ -4,14 +4,10 @@
 
 #include "net/base/address_list.h"
 
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
 #include <stdlib.h>
 
 #include "base/logging.h"
+#include "net/base/sys_addrinfo.h"
 
 namespace net {
 
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc
index 193eb0e6..36975f8 100644
--- a/net/base/host_resolver_impl.cc
+++ b/net/base/host_resolver_impl.cc
@@ -4,17 +4,6 @@
 
 #include "net/base/host_resolver_impl.h"
 
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#include <wspiapi.h>  // Needed for Win2k compat.
-#elif defined(OS_POSIX)
-#include <netdb.h>
-#include <sys/socket.h>
-#endif
-#if defined(OS_LINUX)
-#include <resolv.h>
-#endif
-
 #include "base/compiler_specific.h"
 #include "base/debug_util.h"
 #include "base/message_loop.h"
diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc
index fb7aa05..5453d77 100644
--- a/net/base/host_resolver_impl_unittest.cc
+++ b/net/base/host_resolver_impl_unittest.cc
@@ -4,13 +4,6 @@
 
 #include "net/base/host_resolver_impl.h"
 
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#include <wspiapi.h>
-#elif defined(OS_POSIX)
-#include <netdb.h>
-#endif
-
 #include <string>
 
 #include "base/compiler_specific.h"
@@ -21,6 +14,7 @@
 #include "net/base/load_log_unittest.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
+#include "net/base/sys_addrinfo.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/net/base/host_resolver_proc.cc b/net/base/host_resolver_proc.cc
index b12d7590..87478eb 100644
--- a/net/base/host_resolver_proc.cc
+++ b/net/base/host_resolver_proc.cc
@@ -6,13 +6,6 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#include <wspiapi.h>  // Needed for Win2k compat.
-#elif defined(OS_POSIX)
-#include <netdb.h>
-#include <sys/socket.h>
-#endif
 #if defined(OS_LINUX)
 #include <resolv.h>
 #endif
@@ -21,6 +14,7 @@
 #include "base/time.h"
 #include "net/base/address_list.h"
 #include "net/base/net_errors.h"
+#include "net/base/sys_addrinfo.h"
 
 #if defined(OS_LINUX)
 #include "base/singleton.h"
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 1057402..9dd8510 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -4,18 +4,13 @@
 
 #include "net/base/net_util.h"
 
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
-
 #include "base/file_path.h"
 #include "base/format_macros.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/sys_addrinfo.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/net/base/sys_addrinfo.h b/net/base/sys_addrinfo.h
new file mode 100644
index 0000000..cfdd424
--- /dev/null
+++ b/net/base/sys_addrinfo.h
@@ -0,0 +1,24 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is a convenience header to pull in the platform-specific headers
+// that define at least:
+//
+//     struct addrinfo
+//     struct sockaddr*
+//     getaddrinfo()
+//     freeaddrinfo()
+//     AI_*
+//
+// Prefer including this file instead of directly writing the #if / #else,
+// since it avoids duplicating the platform-specific selections.
+
+#include "build/build_config.h"
+
+#if defined(OS_WIN)
+#include <ws2tcpip.h>
+#elif defined(OS_POSIX)
+#include <netdb.h>
+#endif
+
diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc
index 9745763..d20818a 100644
--- a/net/ftp/ftp_network_transaction_unittest.cc
+++ b/net/ftp/ftp_network_transaction_unittest.cc
@@ -6,17 +6,11 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#elif defined(OS_POSIX)
-#include <netdb.h>
-#include <sys/socket.h>
-#endif
-
 #include "base/ref_counted.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_util.h"
+#include "net/base/sys_addrinfo.h"
 #include "net/base/test_completion_callback.h"
 #include "net/ftp/ftp_network_session.h"
 #include "net/ftp/ftp_request_info.h"
diff --git a/net/net.gyp b/net/net.gyp
index 7f0d88e..4c3fe53 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -135,6 +135,7 @@
         'base/ssl_info.h',
         'base/transport_security_state.cc',
         'base/transport_security_state.h',
+        'base/sys_addrinfo.h',
         'base/telnet_server.cc',
         'base/telnet_server.h',
         'base/test_completion_callback.h',
diff --git a/net/proxy/proxy_resolver_js_bindings.cc b/net/proxy/proxy_resolver_js_bindings.cc
index 1b01651..eb7e4f8 100644
--- a/net/proxy/proxy_resolver_js_bindings.cc
+++ b/net/proxy/proxy_resolver_js_bindings.cc
@@ -2,14 +2,6 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
-
 #include "net/proxy/proxy_resolver_js_bindings.h"
 
 #include "base/compiler_specific.h"
@@ -20,6 +12,7 @@
 #include "net/base/host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
+#include "net/base/sys_addrinfo.h"
 
 namespace net {
 namespace {
diff --git a/net/proxy/proxy_resolver_js_bindings_unittest.cc b/net/proxy/proxy_resolver_js_bindings_unittest.cc
index 1a36d3d..abea285 100644
--- a/net/proxy/proxy_resolver_js_bindings_unittest.cc
+++ b/net/proxy/proxy_resolver_js_bindings_unittest.cc
@@ -2,19 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
-
 #include "base/scoped_ptr.h"
 #include "net/base/address_list.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
+#include "net/base/sys_addrinfo.h"
 #include "net/proxy/proxy_resolver_js_bindings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc
index ef3e9d0..a2fabfd 100644
--- a/net/socket/socks5_client_socket.cc
+++ b/net/socket/socks5_client_socket.cc
@@ -5,17 +5,12 @@
 #include "net/socket/socks5_client_socket.h"
 
 #include "base/basictypes.h"
-#include "build/build_config.h"
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#elif defined(OS_POSIX)
-#include <netdb.h>
-#endif
 #include "base/compiler_specific.h"
 #include "base/trace_event.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_log.h"
 #include "net/base/net_util.h"
+#include "net/base/sys_addrinfo.h"
 
 namespace net {
 
diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc
index d79bd02..aa4c454 100644
--- a/net/socket/socks5_client_socket_unittest.cc
+++ b/net/socket/socks5_client_socket_unittest.cc
@@ -5,16 +5,12 @@
 #include "net/socket/socks5_client_socket.h"
 
 #include <map>
-#include "build/build_config.h"
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#elif defined(OS_POSIX)
-#include <netdb.h>
-#endif
+
 #include "net/base/address_list.h"
 #include "net/base/load_log.h"
 #include "net/base/load_log_unittest.h"
 #include "net/base/mock_host_resolver.h"
+#include "net/base/sys_addrinfo.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/winsock_init.h"
 #include "net/socket/client_socket_factory.h"
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
index 09c1dbd..db70461 100644
--- a/net/socket/socks_client_socket.cc
+++ b/net/socket/socks_client_socket.cc
@@ -5,17 +5,12 @@
 #include "net/socket/socks_client_socket.h"
 
 #include "base/basictypes.h"
-#include "build/build_config.h"
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#elif defined(OS_POSIX)
-#include <netdb.h>
-#endif
 #include "base/compiler_specific.h"
 #include "base/trace_event.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_log.h"
 #include "net/base/net_util.h"
+#include "net/base/sys_addrinfo.h"
 
 namespace net {
 
diff --git a/net/tools/hresolv/hresolv.cc b/net/tools/hresolv/hresolv.cc
index f662817..ed63330 100644
--- a/net/tools/hresolv/hresolv.cc
+++ b/net/tools/hresolv/hresolv.cc
@@ -19,13 +19,6 @@
 //   Interleave synchronous and asynchronous lookups.
 //   Specify the address family.
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
 #include <stdio.h>
 #include <string>
 
@@ -43,6 +36,7 @@
 #include "net/base/host_resolver_impl.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
+#include "net/base/sys_addrinfo.h"
 
 struct FlagName {
   int flag;
diff --git a/net/url_request/url_request_view_net_internals_job.cc b/net/url_request/url_request_view_net_internals_job.cc
index d804a88..3c74d5b 100644
--- a/net/url_request/url_request_view_net_internals_job.cc
+++ b/net/url_request/url_request_view_net_internals_job.cc
@@ -4,12 +4,6 @@
 
 #include "net/url_request/url_request_view_net_internals_job.h"
 
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
-
 #include <sstream>
 
 #include "base/format_macros.h"
@@ -20,6 +14,7 @@
 #include "net/base/load_log_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
+#include "net/base/sys_addrinfo.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket_stream/socket_stream.h"
 #include "net/url_request/url_request.h"
diff --git a/net/websockets/websocket_throttle.cc b/net/websockets/websocket_throttle.cc
index db41248..8d0d1fb 100644
--- a/net/websockets/websocket_throttle.cc
+++ b/net/websockets/websocket_throttle.cc
@@ -4,12 +4,6 @@
 
 #include "net/websockets/websocket_throttle.h"
 
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
-
 #include <string>
 
 #include "base/message_loop.h"
@@ -17,6 +11,7 @@
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
+#include "net/base/sys_addrinfo.h"
 #include "net/socket_stream/socket_stream.h"
 
 namespace net {
diff --git a/net/websockets/websocket_throttle_unittest.cc b/net/websockets/websocket_throttle_unittest.cc
index 3757a0b..55276e9 100644
--- a/net/websockets/websocket_throttle_unittest.cc
+++ b/net/websockets/websocket_throttle_unittest.cc
@@ -2,19 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
-
 #include <string>
 
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/address_list.h"
+#include "net/base/sys_addrinfo.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket_stream/socket_stream.h"
 #include "net/websockets/websocket_throttle.h"