| 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 207f01b6c86866c9d48abdb98c774e4553b2e110..6b9f171f0ced427a261cfb9756d5b609050f3183 100644
|
| --- a/net/android/network_change_notifier_delegate_android.cc
|
| +++ b/net/android/network_change_notifier_delegate_android.cc
|
| @@ -36,16 +36,15 @@ NetworkChangeNotifier::ConnectionType ConvertConnectionType(
|
| NetworkChangeNotifierDelegateAndroid::NetworkChangeNotifierDelegateAndroid()
|
| : observers_(new ObserverListThreadSafe<Observer>()) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - java_network_change_notifier_.Reset(
|
| - Java_NetworkChangeNotifier_init(
|
| - env, base::android::GetApplicationContext()));
|
| + java_network_change_notifier_.Reset(Java_NetworkChangeNotifier_init(
|
| + env, base::android::GetApplicationContext()));
|
| Java_NetworkChangeNotifier_addNativeObserver(
|
| - env, java_network_change_notifier_.obj(),
|
| + env,
|
| + java_network_change_notifier_.obj(),
|
| reinterpret_cast<intptr_t>(this));
|
| SetCurrentConnectionType(
|
| - ConvertConnectionType(
|
| - Java_NetworkChangeNotifier_getCurrentConnectionType(
|
| - env, java_network_change_notifier_.obj())));
|
| + ConvertConnectionType(Java_NetworkChangeNotifier_getCurrentConnectionType(
|
| + env, java_network_change_notifier_.obj())));
|
| }
|
|
|
| NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() {
|
| @@ -53,7 +52,8 @@ NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() {
|
| observers_->AssertEmpty();
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| Java_NetworkChangeNotifier_removeNativeObserver(
|
| - env, java_network_change_notifier_.obj(),
|
| + env,
|
| + java_network_change_notifier_.obj(),
|
| reinterpret_cast<intptr_t>(this));
|
| }
|
|
|
| @@ -68,8 +68,8 @@ void NetworkChangeNotifierDelegateAndroid::NotifyConnectionTypeChanged(
|
| jobject obj,
|
| jint new_connection_type) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - const ConnectionType actual_connection_type = ConvertConnectionType(
|
| - new_connection_type);
|
| + const ConnectionType actual_connection_type =
|
| + ConvertConnectionType(new_connection_type);
|
| SetCurrentConnectionType(actual_connection_type);
|
| observers_->Notify(&Observer::OnConnectionTypeChanged);
|
| }
|
| @@ -80,13 +80,11 @@ jint NetworkChangeNotifierDelegateAndroid::GetConnectionType(JNIEnv*,
|
| return GetCurrentConnectionType();
|
| }
|
|
|
| -void NetworkChangeNotifierDelegateAndroid::AddObserver(
|
| - Observer* observer) {
|
| +void NetworkChangeNotifierDelegateAndroid::AddObserver(Observer* observer) {
|
| observers_->AddObserver(observer);
|
| }
|
|
|
| -void NetworkChangeNotifierDelegateAndroid::RemoveObserver(
|
| - Observer* observer) {
|
| +void NetworkChangeNotifierDelegateAndroid::RemoveObserver(Observer* observer) {
|
| observers_->RemoveObserver(observer);
|
| }
|
|
|
|
|