Index: chrome/browser/android/net/external_estimate_provider_android.cc |
diff --git a/chrome/browser/android/net/external_estimate_provider_android.cc b/chrome/browser/android/net/external_estimate_provider_android.cc |
index d81bd32105367a1e82c91f7fc142c0228a4bb9f4..a46065105970ab845a3b2a39674a79e2ee36043b 100644 |
--- a/chrome/browser/android/net/external_estimate_provider_android.cc |
+++ b/chrome/browser/android/net/external_estimate_provider_android.cc |
@@ -35,8 +35,7 @@ ExternalEstimateProviderAndroid::ExternalEstimateProviderAndroid() |
ExternalEstimateProviderAndroid::~ExternalEstimateProviderAndroid() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
Java_ExternalEstimateProviderAndroid_destroy( |
- base::android::AttachCurrentThread(), |
- j_external_estimate_provider_.obj()); |
+ base::android::AttachCurrentThread(), j_external_estimate_provider_); |
} |
bool ExternalEstimateProviderAndroid::GetRTT(base::TimeDelta* rtt) const { |
@@ -44,7 +43,7 @@ bool ExternalEstimateProviderAndroid::GetRTT(base::TimeDelta* rtt) const { |
JNIEnv* env = base::android::AttachCurrentThread(); |
int32_t milliseconds = |
Java_ExternalEstimateProviderAndroid_getRTTMilliseconds( |
- env, j_external_estimate_provider_.obj()); |
+ env, j_external_estimate_provider_); |
DCHECK_GE(milliseconds, no_value_); |
if (milliseconds == no_value_) |
return false; |
@@ -58,7 +57,7 @@ bool ExternalEstimateProviderAndroid::GetDownstreamThroughputKbps( |
JNIEnv* env = base::android::AttachCurrentThread(); |
int32_t kbps = |
Java_ExternalEstimateProviderAndroid_getDownstreamThroughputKbps( |
- env, j_external_estimate_provider_.obj()); |
+ env, j_external_estimate_provider_); |
DCHECK_GE(kbps, no_value_); |
if (kbps == no_value_) |
return false; |
@@ -71,7 +70,7 @@ bool ExternalEstimateProviderAndroid::GetUpstreamThroughputKbps( |
DCHECK(thread_checker_.CalledOnValidThread()); |
JNIEnv* env = base::android::AttachCurrentThread(); |
int32_t kbps = Java_ExternalEstimateProviderAndroid_getUpstreamThroughputKbps( |
- env, j_external_estimate_provider_.obj()); |
+ env, j_external_estimate_provider_); |
DCHECK_GE(kbps, no_value_); |
if (kbps == no_value_) |
return false; |
@@ -85,7 +84,7 @@ bool ExternalEstimateProviderAndroid::GetTimeSinceLastUpdate( |
JNIEnv* env = base::android::AttachCurrentThread(); |
int32_t seconds = |
Java_ExternalEstimateProviderAndroid_getTimeSinceLastUpdateSeconds( |
- env, j_external_estimate_provider_.obj()); |
+ env, j_external_estimate_provider_); |
DCHECK_GE(seconds, no_value_); |
if (seconds == no_value_) { |
*time_since_last_update = base::TimeDelta::Max(); |
@@ -104,7 +103,7 @@ void ExternalEstimateProviderAndroid::Update() const { |
DCHECK(thread_checker_.CalledOnValidThread()); |
JNIEnv* env = base::android::AttachCurrentThread(); |
Java_ExternalEstimateProviderAndroid_requestUpdate( |
- env, j_external_estimate_provider_.obj()); |
+ env, j_external_estimate_provider_); |
} |
void ExternalEstimateProviderAndroid:: |