Split network_interfaces.h off of net_utils.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..06bb9c5f692f2247e6777ba0ac46eff95c7e519b 100644
--- a/net/base/net_util.h
+++ b/net/base/net_util.h
@@ -26,6 +26,9 @@
 #include "net/base/ip_address_number.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
+// TODO(eroman): Remove this header and require consumers to include it
+//               directly.
+#include "net/base/network_interfaces.h"
 
 class GURL;
 
@@ -377,92 +380,6 @@ enum IPAddressAttributes {
   IP_ADDRESS_ATTRIBUTE_DEPRECATED = 1 << 1,
 };
 
-// struct that is used by GetNetworkList() to represent a network
-// interface.
-struct NET_EXPORT NetworkInterface {
-  NetworkInterface();
-  NetworkInterface(const std::string& name,
-                   const std::string& friendly_name,
-                   uint32 interface_index,
-                   NetworkChangeNotifier::ConnectionType type,
-                   const IPAddressNumber& address,
-                   uint32 prefix_length,
-                   int ip_address_attributes);
-  ~NetworkInterface();
-
-  std::string name;
-  std::string friendly_name;  // Same as |name| on non-Windows.
-  uint32 interface_index;  // Always 0 on Android.
-  NetworkChangeNotifier::ConnectionType type;
-  IPAddressNumber address;
-  uint32 prefix_length;
-  int ip_address_attributes;  // Combination of |IPAddressAttributes|.
-};
-
-typedef std::vector<NetworkInterface> NetworkInterfaceList;
-
-// Policy settings to include/exclude network interfaces.
-enum HostAddressSelectionPolicy {
-  INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES           = 0x0,
-  EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES           = 0x1,
-};
-
-// Returns list of network interfaces except loopback interface. If an
-// interface has more than one address, a separate entry is added to
-// the list for each address.
-// Can be called only on a thread that allows IO.
-NET_EXPORT bool GetNetworkList(NetworkInterfaceList* networks,
-                               int policy);
-
-// Gets the SSID of the currently associated WiFi access point if there is one.
-// Otherwise, returns empty string.
-// Currently only implemented on Linux, ChromeOS and Android.
-NET_EXPORT std::string GetWifiSSID();
-
-// General category of the IEEE 802.11 (wifi) physical layer operating mode.
-enum WifiPHYLayerProtocol {
-  // No wifi support or no associated AP.
-  WIFI_PHY_LAYER_PROTOCOL_NONE,
-  // An obsolete modes introduced by the original 802.11, e.g. IR, FHSS.
-  WIFI_PHY_LAYER_PROTOCOL_ANCIENT,
-  // 802.11a, OFDM-based rates.
-  WIFI_PHY_LAYER_PROTOCOL_A,
-  // 802.11b, DSSS or HR DSSS.
-  WIFI_PHY_LAYER_PROTOCOL_B,
-  // 802.11g, same rates as 802.11a but compatible with 802.11b.
-  WIFI_PHY_LAYER_PROTOCOL_G,
-  // 802.11n, HT rates.
-  WIFI_PHY_LAYER_PROTOCOL_N,
-  // Unclassified mode or failure to identify.
-  WIFI_PHY_LAYER_PROTOCOL_UNKNOWN
-};
-
-// Characterize the PHY mode of the currently associated access point.
-// Currently only available on OS_WIN.
-NET_EXPORT WifiPHYLayerProtocol GetWifiPHYLayerProtocol();
-
-enum WifiOptions {
-  // Disables background SSID scans.
-  WIFI_OPTIONS_DISABLE_SCAN =  1 << 0,
-  // Enables media streaming mode.
-  WIFI_OPTIONS_MEDIA_STREAMING_MODE = 1 << 1
-};
-
-class NET_EXPORT ScopedWifiOptions {
- public:
-  ScopedWifiOptions() {}
-  virtual ~ScopedWifiOptions();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScopedWifiOptions);
-};
-
-// Set temporary options on all wifi interfaces.
-// |options| is an ORed bitfield of WifiOptions.
-// Options are automatically disabled when the scoped pointer
-// is freed. Currently only available on OS_WIN.
-NET_EXPORT scoped_ptr<ScopedWifiOptions> SetWifiOptions(int options);
-
 // Differentiated Services Code Point.
 // See http://tools.ietf.org/html/rfc2474 for details.
 enum DiffServCodePoint {