Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: net/android/network_change_notifier_delegate_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/android/network_library.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0627d5141a8f9a211277000b7b1e3fae4e294039..6bafb44dbe4f5b895c29e8578fa751267bb25427 100644
--- a/net/android/network_change_notifier_delegate_android.cc
+++ b/net/android/network_change_notifier_delegate_android.cc
@@ -78,21 +78,19 @@ NetworkChangeNotifierDelegateAndroid::NetworkChangeNotifierDelegateAndroid()
Java_NetworkChangeNotifier_init(
env, base::android::GetApplicationContext()));
Java_NetworkChangeNotifier_addNativeObserver(
- env, java_network_change_notifier_.obj(),
- reinterpret_cast<intptr_t>(this));
+ env, java_network_change_notifier_, 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_)));
SetCurrentMaxBandwidth(
Java_NetworkChangeNotifier_getCurrentMaxBandwidthInMbps(
- env, java_network_change_notifier_.obj()));
+ env, java_network_change_notifier_));
SetCurrentDefaultNetwork(Java_NetworkChangeNotifier_getCurrentDefaultNetId(
- env, java_network_change_notifier_.obj()));
+ env, java_network_change_notifier_));
NetworkMap network_map;
ScopedJavaLocalRef<jlongArray> networks_and_types =
Java_NetworkChangeNotifier_getCurrentNetworksAndTypes(
- env, java_network_change_notifier_.obj());
+ env, java_network_change_notifier_);
JavaLongArrayToNetworkMap(env, networks_and_types.obj(), &network_map);
SetCurrentNetworksAndTypes(network_map);
}
@@ -102,8 +100,7 @@ NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() {
observers_->AssertEmpty();
JNIEnv* env = base::android::AttachCurrentThread();
Java_NetworkChangeNotifier_removeNativeObserver(
- env, java_network_change_notifier_.obj(),
- reinterpret_cast<intptr_t>(this));
+ env, java_network_change_notifier_, reinterpret_cast<intptr_t>(this));
}
NetworkChangeNotifier::ConnectionType
@@ -117,8 +114,7 @@ NetworkChangeNotifierDelegateAndroid::GetCurrentConnectionSubtype() const {
DCHECK(thread_checker_.CalledOnValidThread());
return ConvertConnectionSubtype(
Java_NetworkChangeNotifier_getCurrentConnectionSubtype(
- base::android::AttachCurrentThread(),
- java_network_change_notifier_.obj()));
+ base::android::AttachCurrentThread(), java_network_change_notifier_));
}
void NetworkChangeNotifierDelegateAndroid::
@@ -358,7 +354,7 @@ void NetworkChangeNotifierDelegateAndroid::FakePurgeActiveNetworkList(
NetworkChangeNotifier::NetworkList networks) {
JNIEnv* env = base::android::AttachCurrentThread();
Java_NetworkChangeNotifier_fakePurgeActiveNetworkList(
- env, base::android::ToJavaLongArray(env, networks).obj());
+ env, base::android::ToJavaLongArray(env, networks));
}
void NetworkChangeNotifierDelegateAndroid::FakeDefaultNetwork(
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/android/network_library.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698