Update from https://crrev.com/306655

net/base/network_change_notifier.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_NETWORK_CHANGE_NOTIFIER_H_
 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_H_
 
 #include "base/basictypes.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/time/time.h"
@@ skipping 16 matching lines @@
 
 // NetworkChangeNotifier monitors the system for network changes, and notifies
 // registered observers of those events.  Observers may register on any thread,
 // and will be called back on the thread from which they registered.
 // NetworkChangeNotifiers are threadsafe, though they must be created and
 // destroyed on the same thread.
 class NET_EXPORT NetworkChangeNotifier {
  public:
   // This is a superset of the connection types in the NetInfo v3 specification:
   // http://w3c.github.io/netinfo/.
+  //
+  // A Java counterpart will be generated for this enum.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
   enum ConnectionType {
     CONNECTION_UNKNOWN = 0,  // A connection exists, but its type is unknown.
                              // Also used as a default value.
     CONNECTION_ETHERNET = 1,
     CONNECTION_WIFI = 2,
     CONNECTION_2G = 3,
     CONNECTION_3G = 4,
     CONNECTION_4G = 5,
     CONNECTION_NONE = 6,     // No connection.
     CONNECTION_BLUETOOTH = 7,
     CONNECTION_LAST = CONNECTION_BLUETOOTH
   };
 
+  // This is the NetInfo v3 set of connection technologies as seen in
+  // http://w3c.github.io/netinfo/. This enum is copied in
+  // NetworkChangeNotifier.java so be sure to change both at once.
+  //
+  // A Java counterpart will be generated for this enum.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
+  enum ConnectionSubtype {
+    SUBTYPE_GSM = 0,
+    SUBTYPE_IDEN,
+    SUBTYPE_CDMA,
+    SUBTYPE_1XRTT,
+    SUBTYPE_GPRS,
+    SUBTYPE_EDGE,
+    SUBTYPE_UMTS,
+    SUBTYPE_EVDO_REV_0,
+    SUBTYPE_EVDO_REV_A,
+    SUBTYPE_HSPA,
+    SUBTYPE_EVDO_REV_B,
+    SUBTYPE_HSDPA,
+    SUBTYPE_HSUPA,
+    SUBTYPE_EHRPD,
+    SUBTYPE_HSPAP,
+    SUBTYPE_LTE,
+    SUBTYPE_LTE_ADVANCED,
+    SUBTYPE_BLUETOOTH_1_2,
+    SUBTYPE_BLUETOOTH_2_1,
+    SUBTYPE_BLUETOOTH_3_0,
+    SUBTYPE_BLUETOOTH_4_0,
+    SUBTYPE_ETHERNET,
+    SUBTYPE_FAST_ETHERNET,
+    SUBTYPE_GIGABIT_ETHERNET,
+    SUBTYPE_10_GIGABIT_ETHERNET,
+    SUBTYPE_WIFI_B,
+    SUBTYPE_WIFI_G,
+    SUBTYPE_WIFI_N,
+    SUBTYPE_WIFI_AC,
+    SUBTYPE_WIFI_AD,
+    SUBTYPE_UNKNOWN,
+    SUBTYPE_NONE,
+    SUBTYPE_OTHER,
+    SUBTYPE_LAST = SUBTYPE_OTHER
+  };
+
   class NET_EXPORT IPAddressObserver {
    public:
     // Will be called when the IP address of the primary interface changes.
     // This includes when the primary interface itself changes.
     virtual void OnIPAddressChanged() = 0;
 
    protected:
     IPAddressObserver() {}
     virtual ~IPAddressObserver() {}
 
@@ skipping 95 matching lines @@
   // attempt to a particular remote site will be successful.
   // The returned value only describes the connection currently used by the
   // device, and does not take into account other machines on the network. For
   // example, if the device is connected using Wifi to a 3G gateway to access
   // the internet, the connection type is CONNECTION_WIFI.
   static ConnectionType GetConnectionType();
 
   // Returns a theoretical upper limit on download bandwidth, potentially based
   // on underlying connection type, signal strength, or some other signal. The
   // default mapping of connection type to maximum bandwidth is provided in the
-  // NetInfo spec: http://w3c.github.io/netinfo/.
+  // NetInfo spec: http://w3c.github.io/netinfo/. Host-specific application
+  // permissions may be required, please see host-specific declaration for more
+  // information.
   static double GetMaxBandwidth();
 
   // Retrieve the last read DnsConfig. This could be expensive if the system has
   // a large HOSTS file.
   static void GetDnsConfig(DnsConfig* config);
 
 #if defined(OS_LINUX)
   // Returns the AddressTrackerLinux if present.
   static const internal::AddressTrackerLinux* GetAddressTracker();
 #endif
@@ skipping 123 matching lines @@
   // TODO(szym): Retrieve AddressMap from NetworkState. http://crbug.com/144212
   virtual const internal::AddressTrackerLinux*
       GetAddressTrackerInternal() const;
 #endif
 
   // See the description of NetworkChangeNotifier::GetMaxBandwidth().
   // Implementations must be thread-safe. Implementations must also be
   // cheap as it is called often.
   virtual double GetCurrentMaxBandwidth() const;
 
+  // Returns a theoretical upper limit on download bandwidth given a connection
+  // subtype. The mapping of connection type to maximum bandwidth is provided in
+  // the NetInfo spec: http://w3c.github.io/netinfo/.
+  static double GetMaxBandwidthForConnectionSubtype(ConnectionSubtype subtype);
+
   // Broadcasts a notification to all registered observers.  Note that this
   // happens asynchronously, even for observers on the current thread, even in
   // tests.
   static void NotifyObserversOfIPAddressChange();
   static void NotifyObserversOfConnectionTypeChange();
   static void NotifyObserversOfDNSChange();
   static void NotifyObserversOfNetworkChange(ConnectionType type);
 
   // Stores |config| in NetworkState and notifies observers.
   static void SetDnsConfig(const DnsConfig& config);
@@ skipping 32 matching lines @@
 
   // Set true to disable non-test notifications (to prevent flakes in tests).
   bool test_notifications_only_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifier);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_CHANGE_NOTIFIER_H_