| Index: components/cronet/android/test/test_upload_data_stream_handler.cc
|
| diff --git a/components/cronet/android/test/test_upload_data_stream_handler.cc b/components/cronet/android/test/test_upload_data_stream_handler.cc
|
| index 92de649a418bd960d618f7d25315d33f438f1fb8..e3fb74efa74f599cc90270f91f4da8745f16bb46 100644
|
| --- a/components/cronet/android/test/test_upload_data_stream_handler.cc
|
| +++ b/components/cronet/android/test/test_upload_data_stream_handler.cc
|
| @@ -56,7 +56,7 @@ void TestUploadDataStreamHandler::OnInitCompleted(int res) {
|
| init_callback_invoked_ = true;
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| cronet::Java_TestUploadDataStreamHandler_onInitCompleted(
|
| - env, jtest_upload_data_stream_handler_.obj(), res);
|
| + env, jtest_upload_data_stream_handler_, res);
|
| }
|
|
|
| void TestUploadDataStreamHandler::OnReadCompleted(int res) {
|
| @@ -119,11 +119,11 @@ void TestUploadDataStreamHandler::InitOnNetworkThread() {
|
| &TestUploadDataStreamHandler::OnInitCompleted, base::Unretained(this)));
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| cronet::Java_TestUploadDataStreamHandler_onInitCalled(
|
| - env, jtest_upload_data_stream_handler_.obj(), res);
|
| + env, jtest_upload_data_stream_handler_, res);
|
|
|
| if (res == net::OK) {
|
| cronet::Java_TestUploadDataStreamHandler_onInitCompleted(
|
| - env, jtest_upload_data_stream_handler_.obj(), res);
|
| + env, jtest_upload_data_stream_handler_, res);
|
| }
|
| }
|
|
|
| @@ -150,21 +150,21 @@ void TestUploadDataStreamHandler::ResetOnNetworkThread() {
|
| upload_data_stream_->Reset();
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| cronet::Java_TestUploadDataStreamHandler_onResetCompleted(
|
| - env, jtest_upload_data_stream_handler_.obj());
|
| + env, jtest_upload_data_stream_handler_);
|
| }
|
|
|
| void TestUploadDataStreamHandler::CheckInitCallbackNotInvokedOnNetworkThread() {
|
| DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| cronet::Java_TestUploadDataStreamHandler_onCheckInitCallbackNotInvoked(
|
| - env, jtest_upload_data_stream_handler_.obj(), !init_callback_invoked_);
|
| + env, jtest_upload_data_stream_handler_, !init_callback_invoked_);
|
| }
|
|
|
| void TestUploadDataStreamHandler::CheckReadCallbackNotInvokedOnNetworkThread() {
|
| DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| cronet::Java_TestUploadDataStreamHandler_onCheckReadCallbackNotInvoked(
|
| - env, jtest_upload_data_stream_handler_.obj(), !read_callback_invoked_);
|
| + env, jtest_upload_data_stream_handler_, !read_callback_invoked_);
|
| }
|
|
|
| void TestUploadDataStreamHandler::NotifyJavaReadCompleted() {
|
| @@ -174,7 +174,7 @@ void TestUploadDataStreamHandler::NotifyJavaReadCompleted() {
|
| if (read_buffer_.get() && bytes_read_ > 0)
|
| data_read = std::string(read_buffer_->data(), bytes_read_);
|
| cronet::Java_TestUploadDataStreamHandler_onReadCompleted(
|
| - env, jtest_upload_data_stream_handler_.obj(), bytes_read_,
|
| + env, jtest_upload_data_stream_handler_, bytes_read_,
|
| base::android::ConvertUTF8ToJavaString(env, data_read).obj());
|
| }
|
|
|
|
|