Stop including ip_address_number.h from net_util.h

net/base/net_util.h

 // Copyright (c) 2012 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.
 
 #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>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #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;
 
 namespace base {
 class Time;
 }
 
 namespace url {
 struct CanonHostInfo;
 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;
 
 #if defined(OS_WIN)
 // Bluetooth address size. Windows Bluetooth is supported via winsock.
 static const size_t kBluetoothAddressSize = 6;
 #endif
 
 // Nothing is ommitted.
@@ skipping 436 matching lines @@
   DSCP_CS5  = 40,  // Video
   DSCP_EF   = 46,  // Voice
   DSCP_CS6  = 48,  // Voice
   DSCP_CS7  = 56,  // Control messages
   DSCP_LAST = DSCP_CS7
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NET_UTIL_H_