Update from https://crrev.com/308996

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 46 matching lines @@
   java_network_change_notifier_.Reset(
       Java_NetworkChangeNotifier_init(
           env, base::android::GetApplicationContext()));
   Java_NetworkChangeNotifier_addNativeObserver(
       env, java_network_change_notifier_.obj(),
       reinterpret_cast<intptr_t>(this));
   SetCurrentConnectionType(
       ConvertConnectionType(
           Java_NetworkChangeNotifier_getCurrentConnectionType(
               env, java_network_change_notifier_.obj())));
-  SetCurrentMaxBandwidth(Java_NetworkChangeNotifier_getCurrentMaxBandwidth(
-      env, java_network_change_notifier_.obj()));
+  SetCurrentMaxBandwidth(
+      Java_NetworkChangeNotifier_getCurrentMaxBandwidthInMbps(
+          env, java_network_change_notifier_.obj()));
 }
 
 NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_->AssertEmpty();
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_removeNativeObserver(
       env, java_network_change_notifier_.obj(),
       reinterpret_cast<intptr_t>(this));
 }
@@ skipping 10 matching lines @@
 }
 
 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);
-  SetCurrentMaxBandwidth(Java_NetworkChangeNotifier_getCurrentMaxBandwidth(
-      env, java_network_change_notifier_.obj()));
   observers_->Notify(&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());
+  SetCurrentMaxBandwidth(new_max_bandwidth);
+  observers_->Notify(&Observer::OnMaxBandwidthChanged, new_max_bandwidth);
+}
+
 void NetworkChangeNotifierDelegateAndroid::AddObserver(
     Observer* observer) {
   observers_->AddObserver(observer);
 }
 
 void NetworkChangeNotifierDelegateAndroid::RemoveObserver(
     Observer* observer) {
   observers_->RemoveObserver(observer);
 }
 
@@ skipping 18 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