Land Recent QUIC changes.

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 5cfd1eaf36d31c231990d1d110ef2d2060a884e5..e2519ba0f4ea4a615a2e48d337009b8c98550312 100644
--- a/net/base/net_util.h
+++ b/net/base/net_util.h
@@ -22,6 +22,7 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
+#include "net/base/address_family.h"
 #include "net/base/escape.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
@@ -458,6 +459,10 @@ NET_EXPORT IPv6SupportResult TestIPv6Support();
 // Also returns false if it cannot determine this.
 bool HaveOnlyLoopbackAddresses();
 
+// Returns AddressFamily of the address.
+NET_EXPORT_PRIVATE AddressFamily GetAddressFamily(
+    const IPAddressNumber& address);
+
 // Parses an IP address literal (either IPv4 or IPv6) to its numeric value.
 // Returns true on success and fills |ip_number| with the numeric value.
 NET_EXPORT_PRIVATE bool ParseIPLiteralToNumber(const std::string& ip_literal,