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

6 files changed, 28 insertions, 36 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
+