Add connection type to NCN::MaxBandwidthChanged

net/android/network_change_notifier_delegate_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.
 
 #include "net/android/network_change_notifier_delegate_android.h"
 
 #include "base/logging.h"
 #include "jni/NetworkChangeNotifier_jni.h"
 #include "net/android/network_change_notifier_android.h"
 
@@ skipping 66 matching lines @@
       env, java_network_change_notifier_.obj(),
       reinterpret_cast<intptr_t>(this));
 }
 
 NetworkChangeNotifier::ConnectionType
 NetworkChangeNotifierDelegateAndroid::GetCurrentConnectionType() const {
   base::AutoLock auto_lock(connection_lock_);
   return connection_type_;
 }
 
-double NetworkChangeNotifierDelegateAndroid::GetCurrentMaxBandwidth() const {
+double
+NetworkChangeNotifierDelegateAndroid::GetCurrentMaxBandwidthAndConnectionType(
+    ConnectionType* connection_type) const {
   base::AutoLock auto_lock(connection_lock_);
+  if (connection_type != nullptr)
+    *connection_type = connection_type_;
   return connection_max_bandwidth_;
 }
 
 void NetworkChangeNotifierDelegateAndroid::NotifyConnectionTypeChanged(
     JNIEnv* env,
     jobject obj,
     jint new_connection_type) {
   DCHECK(thread_checker_.CalledOnValidThread());
   const ConnectionType actual_connection_type = ConvertConnectionType(
       new_connection_type);
   SetCurrentConnectionType(actual_connection_type);
   observers_->Notify(FROM_HERE, &Observer::OnConnectionTypeChanged);
 }
 
 jint NetworkChangeNotifierDelegateAndroid::GetConnectionType(JNIEnv*,
                                                              jobject) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return GetCurrentConnectionType();
 }
 
 void NetworkChangeNotifierDelegateAndroid::NotifyMaxBandwidthChanged(
     JNIEnv* env,
     jobject obj,
     jdouble new_max_bandwidth) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(new_max_bandwidth != GetCurrentMaxBandwidth());
+  DCHECK(new_max_bandwidth != GetCurrentMaxBandwidthAndConnectionType(nullptr));
+
   SetCurrentMaxBandwidth(new_max_bandwidth);
   observers_->Notify(FROM_HERE, &Observer::OnMaxBandwidthChanged,
-                     new_max_bandwidth);
+                     GetCurrentConnectionType(), new_max_bandwidth);
 }
 
 void NetworkChangeNotifierDelegateAndroid::AddObserver(
     Observer* observer) {
   observers_->AddObserver(observer);
 }
 
 void NetworkChangeNotifierDelegateAndroid::RemoveObserver(
     Observer* observer) {
   observers_->RemoveObserver(observer);
@@ skipping 20 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_forceConnectivityState(env, true);
 }
 
 void NetworkChangeNotifierDelegateAndroid::SetOffline() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_forceConnectivityState(env, false);
 }
 
 }  // namespace net