| Index: net/android/network_change_notifier_delegate_android.cc
|
| diff --git a/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc
|
| index a6a71322586998df43233ff8ffb12faa13ce48b0..99a6cc2d771432d3943726612d989e83b3f98f15 100644
|
| --- a/net/android/network_change_notifier_delegate_android.cc
|
| +++ b/net/android/network_change_notifier_delegate_android.cc
|
| @@ -64,8 +64,9 @@ NetworkChangeNotifierDelegateAndroid::NetworkChangeNotifierDelegateAndroid()
|
| 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() {
|
| @@ -96,8 +97,6 @@ void NetworkChangeNotifierDelegateAndroid::NotifyConnectionTypeChanged(
|
| 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);
|
| }
|
|
|
| @@ -107,6 +106,16 @@ jint NetworkChangeNotifierDelegateAndroid::GetConnectionType(JNIEnv*,
|
| 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);
|
|
|