Stop including ip_address_number.h from net_util.h

net/base/net_util.h

Index: net/base/net_util.h
diff --git a/net/base/net_util.h b/net/base/net_util.h
index b6dbf35fe3bfdd991aa3a0f93fdf9e4239fadd85..652e1c6911cccb742b1ddd381ded0f9b6f03cd5f 100644
--- a/net/base/net_util.h
+++ b/net/base/net_util.h
@@ -5,15 +5,6 @@
 #ifndef NET_BASE_NET_UTIL_H_
 #define NET_BASE_NET_UTIL_H_
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#include <ws2tcpip.h>
-#elif defined(OS_POSIX)
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
 

[mmenke, 2015/06/03 15:21:25]

nit:  Remove extra blank line

[eroman, 2015/06/03 18:29:10]

Done.

 #include <string>
 #include <vector>
@@ -23,9 +14,9 @@
 #include "base/strings/utf_offset_string_conversions.h"
 #include "net/base/address_family.h"
 #include "net/base/escape.h"
-#include "net/base/ip_address_number.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
+#include "net/base/sys_addrinfo.h"
 
 class GURL;
 
@@ -40,6 +31,10 @@ struct Parsed;
 
 namespace net {
 
+// This is a "forward declaration" to avoid including ip_address_number.h
+// Keep this in sync.
+typedef std::vector<unsigned char> IPAddressNumber;

[mmenke, 2015/06/03 15:21:25]

Hrm...  I'm very skeptical of keeping this here.  After your other CL lands, the
only function in this file that even uses this is GetAddressFamily.

[eroman, 2015/06/03 16:23:28]

I could perhaps move GetAddressFamily() elsewhere. But in the meantime I don't
want to prevent regressions since tracking down all the headers was really
annoying.

+
 // Used by FormatUrl to specify handling of certain parts of the url.
 typedef uint32 FormatUrlType;
 typedef uint32 FormatUrlTypes;