[NetInfo] Browser changes to support connection.downlinkMax

net/base/network_change_notifier.cc

 // 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.
 
 #include "net/base/network_change_notifier.h"
 
 #include <limits>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
@@ skipping 531 matching lines @@
 }
 
 // static
 double NetworkChangeNotifier::GetMaxBandwidth() {
   return g_network_change_notifier ?
       g_network_change_notifier->GetCurrentMaxBandwidth() :
       std::numeric_limits<double>::infinity();
 }
 
 // static
+double NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
+    ConnectionSubtype subtype) {
+  switch (subtype) {
+    case SUBTYPE_GSM:
+      return 0.01;
+    case SUBTYPE_IDEN:
+      return 0.064;
+    case SUBTYPE_CDMA:
+      return 0.115;
+    case SUBTYPE_1XRTT:
+      return 0.153;
+    case SUBTYPE_GPRS:
+      return 0.237;
+    case SUBTYPE_EDGE:
+      return 0.384;
+    case SUBTYPE_UMTS:
+      return 2.0;
+    case SUBTYPE_EVDO_REV_0:
+      return 2.46;
+    case SUBTYPE_EVDO_REV_A:
+      return 3.1;
+    case SUBTYPE_HSPA:
+      return 3.6;
+    case SUBTYPE_EVDO_REV_B:
+      return 14.7;
+    case SUBTYPE_HSDPA:
+      return 14.3;
+    case SUBTYPE_HSUPA:
+      return 14.4;
+    case SUBTYPE_EHRPD:
+      return 21.0;
+    case SUBTYPE_HSPAP:
+      return 42.0;
+    case SUBTYPE_LTE:
+      return 100.0;
+    case SUBTYPE_LTE_ADVANCED:
+      return 100.0;
+    case SUBTYPE_BLUETOOTH_1_2:
+      return 1.0;
+    case SUBTYPE_BLUETOOTH_2_1:
+      return 3.0;
+    case SUBTYPE_BLUETOOTH_3_0:
+      return 24.0;
+    case SUBTYPE_BLUETOOTH_4_0:
+      return 1.0;
+    case SUBTYPE_ETHERNET:
+      return 10.0;
+    case SUBTYPE_FAST_ETHERNET:
+      return 100.0;
+    case SUBTYPE_GIGABIT_ETHERNET:
+      return 1000.0;
+    case SUBTYPE_10_GIGABIT_ETHERNET:
+      return 10000.0;
+    case SUBTYPE_WIFI_B:
+      return 11.0;
+    case SUBTYPE_WIFI_G:
+      return 54.0;
+    case SUBTYPE_WIFI_N:
+      return 600.0;
+    case SUBTYPE_WIFI_AC:
+      return 1300.0;
+    case SUBTYPE_WIFI_AD:
+      return 7000.0;
+    case SUBTYPE_UNKNOWN:
+      return std::numeric_limits<double>::infinity();
+    case SUBTYPE_NONE:
+      return 0.0;
+    case SUBTYPE_OTHER:
+      return std::numeric_limits<double>::infinity();
+  }
+  NOTREACHED();
+  return std::numeric_limits<double>::infinity();
+}
+
+// static
 void NetworkChangeNotifier::GetDnsConfig(DnsConfig* config) {
   if (!g_network_change_notifier) {
     *config = DnsConfig();
   } else {
     g_network_change_notifier->network_state_->GetDnsConfig(config);
   }
 }
 
 // static
 const char* NetworkChangeNotifier::ConnectionTypeToString(
@@ skipping 280 matching lines @@
 double NetworkChangeNotifier::GetCurrentMaxBandwidth() const {
   // This default implementation conforms to the NetInfo V3 specification but
   // should be overridden to provide specific bandwidth data based on the
   // platform.
   if (GetCurrentConnectionType() == CONNECTION_NONE)
     return 0.0;
   return std::numeric_limits<double>::infinity();
 }
 
 // static
-double NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
-    ConnectionSubtype subtype) {
-  switch (subtype) {
-    case SUBTYPE_GSM:
-      return 0.01;
-    case SUBTYPE_IDEN:
-      return 0.064;
-    case SUBTYPE_CDMA:
-      return 0.115;
-    case SUBTYPE_1XRTT:
-      return 0.153;
-    case SUBTYPE_GPRS:
-      return 0.237;
-    case SUBTYPE_EDGE:
-      return 0.384;
-    case SUBTYPE_UMTS:
-      return 2.0;
-    case SUBTYPE_EVDO_REV_0:
-      return 2.46;
-    case SUBTYPE_EVDO_REV_A:
-      return 3.1;
-    case SUBTYPE_HSPA:
-      return 3.6;
-    case SUBTYPE_EVDO_REV_B:
-      return 14.7;
-    case SUBTYPE_HSDPA:
-      return 14.3;
-    case SUBTYPE_HSUPA:
-      return 14.4;
-    case SUBTYPE_EHRPD:
-      return 21.0;
-    case SUBTYPE_HSPAP:
-      return 42.0;
-    case SUBTYPE_LTE:
-      return 100.0;
-    case SUBTYPE_LTE_ADVANCED:
-      return 100.0;
-    case SUBTYPE_BLUETOOTH_1_2:
-      return 1.0;
-    case SUBTYPE_BLUETOOTH_2_1:
-      return 3.0;
-    case SUBTYPE_BLUETOOTH_3_0:
-      return 24.0;
-    case SUBTYPE_BLUETOOTH_4_0:
-      return 1.0;
-    case SUBTYPE_ETHERNET:
-      return 10.0;
-    case SUBTYPE_FAST_ETHERNET:
-      return 100.0;
-    case SUBTYPE_GIGABIT_ETHERNET:
-      return 1000.0;
-    case SUBTYPE_10_GIGABIT_ETHERNET:
-      return 10000.0;
-    case SUBTYPE_WIFI_B:
-      return 11.0;
-    case SUBTYPE_WIFI_G:
-      return 54.0;
-    case SUBTYPE_WIFI_N:
-      return 600.0;
-    case SUBTYPE_WIFI_AC:
-      return 1300.0;
-    case SUBTYPE_WIFI_AD:
-      return 7000.0;
-    case SUBTYPE_UNKNOWN:
-      return std::numeric_limits<double>::infinity();
-    case SUBTYPE_NONE:
-      return 0.0;
-    case SUBTYPE_OTHER:
-      return std::numeric_limits<double>::infinity();
-  }
-  NOTREACHED();
-  return std::numeric_limits<double>::infinity();
-}
-
-// static
 void NetworkChangeNotifier::NotifyObserversOfIPAddressChange() {
   if (g_network_change_notifier &&
       !NetworkChangeNotifier::test_notifications_only_) {
     g_network_change_notifier->NotifyObserversOfIPAddressChangeImpl();
   }
 }
 
 // static
 void NetworkChangeNotifier::NotifyObserversOfConnectionTypeChange() {
   if (g_network_change_notifier &&
@@ skipping 103 matching lines @@
 
 NetworkChangeNotifier::DisableForTest::~DisableForTest() {
   DCHECK(!g_network_change_notifier);
   g_network_change_notifier = network_change_notifier_;
 }
 
 void NetworkChangeNotifier::DNSObserver::OnInitialDNSConfigRead() {
 }
 
 }  // namespace net