Add connection type to NCN::MaxBandwidthChanged

net/android/network_change_notifier_android.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.
 
 ////////////////////////////////////////////////////////////////////////////////
 // Threading considerations:
 //
 // This class is designed to meet various threading guarantees starting from the
 // ones imposed by NetworkChangeNotifier:
 // - The notifier can be constructed on any thread.
@@ skipping 126 matching lines @@
 
 NetworkChangeNotifierAndroid::~NetworkChangeNotifierAndroid() {
   delegate_->RemoveObserver(this);
 }
 
 NetworkChangeNotifier::ConnectionType
 NetworkChangeNotifierAndroid::GetCurrentConnectionType() const {
   return delegate_->GetCurrentConnectionType();
 }
 
-double NetworkChangeNotifierAndroid::GetCurrentMaxBandwidth() const {
-  return delegate_->GetCurrentMaxBandwidth();
+void NetworkChangeNotifierAndroid::GetCurrentMaxBandwidthAndConnectionType(
+    double* max_bandwidth_mbps,
+    ConnectionType* connection_type) const {
+  delegate_->GetCurrentMaxBandwidthAndConnectionType(max_bandwidth_mbps,
+                                                     connection_type);
 }
 
 void NetworkChangeNotifierAndroid::OnConnectionTypeChanged() {
   DnsConfigServiceThread::NotifyNetworkChangeNotifierObservers();
 }
 
 void NetworkChangeNotifierAndroid::OnMaxBandwidthChanged(
+    ConnectionType type,
     double max_bandwidth_mbps) {
   NetworkChangeNotifier::NotifyObserversOfMaxBandwidthChange(
-      max_bandwidth_mbps);
+      type, max_bandwidth_mbps);
 }
 
 // static
 bool NetworkChangeNotifierAndroid::Register(JNIEnv* env) {
   return NetworkChangeNotifierDelegateAndroid::Register(env);
 }
 
 NetworkChangeNotifierAndroid::NetworkChangeNotifierAndroid(
     NetworkChangeNotifierDelegateAndroid* delegate,
     const DnsConfig* dns_config_for_testing)
@@ skipping 18 matching lines @@
   // so delay IPAddressChanged so they get merged with the following
   // ConnectionTypeChanged signal.
   params.ip_address_offline_delay_ = base::TimeDelta::FromSeconds(1);
   params.ip_address_online_delay_ = base::TimeDelta::FromSeconds(1);
   params.connection_type_offline_delay_ = base::TimeDelta::FromSeconds(0);
   params.connection_type_online_delay_ = base::TimeDelta::FromSeconds(0);
   return params;
 }
 
 }  // namespace net