| Index: net/base/net_util.h
|
| diff --git a/net/base/net_util.h b/net/base/net_util.h
|
| index c5d49fae244cf74829b83a4769785f646ef24ff7..c139760981cb835ecfa8f5b90ff8b6ff885920f7 100644
|
| --- a/net/base/net_util.h
|
| +++ b/net/base/net_util.h
|
| @@ -419,41 +419,6 @@ class NET_EXPORT ScopedPortException {
|
| DISALLOW_COPY_AND_ASSIGN(ScopedPortException);
|
| };
|
|
|
| -// These are used for UMA histograms. Any new values must be added to the end.
|
| -enum IPv6SupportStatus {
|
| - IPV6_CANNOT_CREATE_SOCKETS,
|
| - IPV6_CAN_CREATE_SOCKETS, // Obsolete
|
| - IPV6_GETIFADDRS_FAILED,
|
| - IPV6_GLOBAL_ADDRESS_MISSING,
|
| - IPV6_GLOBAL_ADDRESS_PRESENT,
|
| - IPV6_INTERFACE_ARRAY_TOO_SHORT,
|
| - IPV6_SUPPORT_MAX // Bounding value for enumeration. Also used for case
|
| - // where detection is not supported.
|
| -};
|
| -
|
| -// Encapsulates the results of an IPv6 probe.
|
| -struct NET_EXPORT IPv6SupportResult {
|
| - IPv6SupportResult(bool ipv6_supported,
|
| - IPv6SupportStatus ipv6_support_status,
|
| - int os_error);
|
| -
|
| - // Serializes the results to a Value. Caller takes ownership of the returned
|
| - // Value.
|
| - base::Value* ToNetLogValue(NetLog::LogLevel log_level) const;
|
| -
|
| - bool ipv6_supported;
|
| - // Set to IPV6_SUPPORT_MAX if detection isn't supported.
|
| - IPv6SupportStatus ipv6_support_status;
|
| -
|
| - // Error code from the OS, or zero if there was no error.
|
| - int os_error;
|
| -};
|
| -
|
| -// Perform a simplistic test to see if IPv6 is supported by trying to create an
|
| -// IPv6 socket.
|
| -// TODO(jar): Make test more in-depth as needed.
|
| -NET_EXPORT IPv6SupportResult TestIPv6Support();
|
| -
|
| // Returns true if it can determine that only loopback addresses are configured.
|
| // i.e. if only 127.0.0.1 and ::1 are routable.
|
| // Also returns false if it cannot determine this.
|
|
|