| Index: components/cronet/android/chromium_url_request.cc
|
| diff --git a/components/cronet/android/chromium_url_request.cc b/components/cronet/android/chromium_url_request.cc
|
| index 178307ba365fde0f47bedddb282f2ab314cb0c4b..9286c4e508d073cd261181438de2293adc2cc2c4 100644
|
| --- a/components/cronet/android/chromium_url_request.cc
|
| +++ b/components/cronet/android/chromium_url_request.cc
|
| @@ -70,8 +70,7 @@ class JniURLRequestAdapterDelegate
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| base::android::ScopedJavaLocalRef<jobject> java_buffer(
|
| env, env->NewDirectByteBuffer(request_adapter->Data(), bytes_read));
|
| - cronet::Java_ChromiumUrlRequest_onBytesRead(
|
| - env, owner_, java_buffer.obj());
|
| + cronet::Java_ChromiumUrlRequest_onBytesRead(env, owner_, java_buffer);
|
| }
|
| }
|
|
|
| @@ -85,7 +84,7 @@ class JniURLRequestAdapterDelegate
|
| base::android::ScopedJavaLocalRef<jobject> java_buffer(
|
| env, env->NewDirectByteBuffer(buf->data(), buf_length));
|
| jint bytes_read = cronet::Java_ChromiumUrlRequest_readFromUploadChannel(
|
| - env, owner_, java_buffer.obj());
|
| + env, owner_, java_buffer);
|
| return bytes_read;
|
| }
|
|
|
| @@ -387,7 +386,7 @@ static void GetAllHeaders(JNIEnv* env,
|
| ScopedJavaLocalRef<jstring> value =
|
| ConvertUTF8ToJavaString(env, header_value);
|
| Java_ChromiumUrlRequest_onAppendResponseHeader(env, jcaller, jheaders_map,
|
| - name.obj(), value.obj());
|
| + name, value);
|
| }
|
|
|
| // Some implementations (notably HttpURLConnection) include a mapping for the
|
| @@ -395,7 +394,7 @@ static void GetAllHeaders(JNIEnv* env,
|
| ScopedJavaLocalRef<jstring> status_line =
|
| ConvertUTF8ToJavaString(env, headers->GetStatusLine());
|
| Java_ChromiumUrlRequest_onAppendResponseHeader(env, jcaller, jheaders_map,
|
| - nullptr, status_line.obj());
|
| + nullptr, status_line);
|
| }
|
|
|
| static ScopedJavaLocalRef<jstring> GetNegotiatedProtocol(
|
|
|