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

Side by Side Diff: components/cronet/android/test/test_upload_data_stream_handler.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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/cronet/android/test/test_upload_data_stream_handler.h" 5 #include "components/cronet/android/test/test_upload_data_stream_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 network_thread->task_runner()->DeleteSoon(FROM_HERE, this); 49 network_thread->task_runner()->DeleteSoon(FROM_HERE, this);
50 // Deleting thread stops it after all tasks are completed. 50 // Deleting thread stops it after all tasks are completed.
51 network_thread.reset(); 51 network_thread.reset();
52 } 52 }
53 53
54 void TestUploadDataStreamHandler::OnInitCompleted(int res) { 54 void TestUploadDataStreamHandler::OnInitCompleted(int res) {
55 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread()); 55 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
56 init_callback_invoked_ = true; 56 init_callback_invoked_ = true;
57 JNIEnv* env = base::android::AttachCurrentThread(); 57 JNIEnv* env = base::android::AttachCurrentThread();
58 cronet::Java_TestUploadDataStreamHandler_onInitCompleted( 58 cronet::Java_TestUploadDataStreamHandler_onInitCompleted(
59 env, jtest_upload_data_stream_handler_.obj(), res); 59 env, jtest_upload_data_stream_handler_, res);
60 } 60 }
61 61
62 void TestUploadDataStreamHandler::OnReadCompleted(int res) { 62 void TestUploadDataStreamHandler::OnReadCompleted(int res) {
63 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread()); 63 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
64 read_callback_invoked_ = true; 64 read_callback_invoked_ = true;
65 bytes_read_ = res; 65 bytes_read_ = res;
66 NotifyJavaReadCompleted(); 66 NotifyJavaReadCompleted();
67 } 67 }
68 68
69 void TestUploadDataStreamHandler::Init(JNIEnv* env, 69 void TestUploadDataStreamHandler::Init(JNIEnv* env,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 void TestUploadDataStreamHandler::InitOnNetworkThread() { 113 void TestUploadDataStreamHandler::InitOnNetworkThread() {
114 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread()); 114 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
115 init_callback_invoked_ = false; 115 init_callback_invoked_ = false;
116 read_buffer_ = nullptr; 116 read_buffer_ = nullptr;
117 bytes_read_ = 0; 117 bytes_read_ = 0;
118 int res = upload_data_stream_->Init(base::Bind( 118 int res = upload_data_stream_->Init(base::Bind(
119 &TestUploadDataStreamHandler::OnInitCompleted, base::Unretained(this))); 119 &TestUploadDataStreamHandler::OnInitCompleted, base::Unretained(this)));
120 JNIEnv* env = base::android::AttachCurrentThread(); 120 JNIEnv* env = base::android::AttachCurrentThread();
121 cronet::Java_TestUploadDataStreamHandler_onInitCalled( 121 cronet::Java_TestUploadDataStreamHandler_onInitCalled(
122 env, jtest_upload_data_stream_handler_.obj(), res); 122 env, jtest_upload_data_stream_handler_, res);
123 123
124 if (res == net::OK) { 124 if (res == net::OK) {
125 cronet::Java_TestUploadDataStreamHandler_onInitCompleted( 125 cronet::Java_TestUploadDataStreamHandler_onInitCompleted(
126 env, jtest_upload_data_stream_handler_.obj(), res); 126 env, jtest_upload_data_stream_handler_, res);
127 } 127 }
128 } 128 }
129 129
130 void TestUploadDataStreamHandler::ReadOnNetworkThread() { 130 void TestUploadDataStreamHandler::ReadOnNetworkThread() {
131 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread()); 131 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
132 read_callback_invoked_ = false; 132 read_callback_invoked_ = false;
133 if (!read_buffer_.get()) 133 if (!read_buffer_.get())
134 read_buffer_ = new net::IOBufferWithSize(kReadBufferSize); 134 read_buffer_ = new net::IOBufferWithSize(kReadBufferSize);
135 135
136 int bytes_read = upload_data_stream_->Read( 136 int bytes_read = upload_data_stream_->Read(
137 read_buffer_.get(), kReadBufferSize, 137 read_buffer_.get(), kReadBufferSize,
138 base::Bind(&TestUploadDataStreamHandler::OnReadCompleted, 138 base::Bind(&TestUploadDataStreamHandler::OnReadCompleted,
139 base::Unretained(this))); 139 base::Unretained(this)));
140 if (bytes_read == net::OK) { 140 if (bytes_read == net::OK) {
141 bytes_read_ = bytes_read; 141 bytes_read_ = bytes_read;
142 NotifyJavaReadCompleted(); 142 NotifyJavaReadCompleted();
143 } 143 }
144 } 144 }
145 145
146 void TestUploadDataStreamHandler::ResetOnNetworkThread() { 146 void TestUploadDataStreamHandler::ResetOnNetworkThread() {
147 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread()); 147 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
148 read_buffer_ = nullptr; 148 read_buffer_ = nullptr;
149 bytes_read_ = 0; 149 bytes_read_ = 0;
150 upload_data_stream_->Reset(); 150 upload_data_stream_->Reset();
151 JNIEnv* env = base::android::AttachCurrentThread(); 151 JNIEnv* env = base::android::AttachCurrentThread();
152 cronet::Java_TestUploadDataStreamHandler_onResetCompleted( 152 cronet::Java_TestUploadDataStreamHandler_onResetCompleted(
153 env, jtest_upload_data_stream_handler_.obj()); 153 env, jtest_upload_data_stream_handler_);
154 } 154 }
155 155
156 void TestUploadDataStreamHandler::CheckInitCallbackNotInvokedOnNetworkThread() { 156 void TestUploadDataStreamHandler::CheckInitCallbackNotInvokedOnNetworkThread() {
157 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread()); 157 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
158 JNIEnv* env = base::android::AttachCurrentThread(); 158 JNIEnv* env = base::android::AttachCurrentThread();
159 cronet::Java_TestUploadDataStreamHandler_onCheckInitCallbackNotInvoked( 159 cronet::Java_TestUploadDataStreamHandler_onCheckInitCallbackNotInvoked(
160 env, jtest_upload_data_stream_handler_.obj(), !init_callback_invoked_); 160 env, jtest_upload_data_stream_handler_, !init_callback_invoked_);
161 } 161 }
162 162
163 void TestUploadDataStreamHandler::CheckReadCallbackNotInvokedOnNetworkThread() { 163 void TestUploadDataStreamHandler::CheckReadCallbackNotInvokedOnNetworkThread() {
164 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread()); 164 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
165 JNIEnv* env = base::android::AttachCurrentThread(); 165 JNIEnv* env = base::android::AttachCurrentThread();
166 cronet::Java_TestUploadDataStreamHandler_onCheckReadCallbackNotInvoked( 166 cronet::Java_TestUploadDataStreamHandler_onCheckReadCallbackNotInvoked(
167 env, jtest_upload_data_stream_handler_.obj(), !read_callback_invoked_); 167 env, jtest_upload_data_stream_handler_, !read_callback_invoked_);
168 } 168 }
169 169
170 void TestUploadDataStreamHandler::NotifyJavaReadCompleted() { 170 void TestUploadDataStreamHandler::NotifyJavaReadCompleted() {
171 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread()); 171 DCHECK(network_thread_->task_runner()->BelongsToCurrentThread());
172 JNIEnv* env = base::android::AttachCurrentThread(); 172 JNIEnv* env = base::android::AttachCurrentThread();
173 std::string data_read = ""; 173 std::string data_read = "";
174 if (read_buffer_.get() && bytes_read_ > 0) 174 if (read_buffer_.get() && bytes_read_ > 0)
175 data_read = std::string(read_buffer_->data(), bytes_read_); 175 data_read = std::string(read_buffer_->data(), bytes_read_);
176 cronet::Java_TestUploadDataStreamHandler_onReadCompleted( 176 cronet::Java_TestUploadDataStreamHandler_onReadCompleted(
177 env, jtest_upload_data_stream_handler_.obj(), bytes_read_, 177 env, jtest_upload_data_stream_handler_, bytes_read_,
178 base::android::ConvertUTF8ToJavaString(env, data_read).obj()); 178 base::android::ConvertUTF8ToJavaString(env, data_read).obj());
179 } 179 }
180 180
181 static jlong CreateTestUploadDataStreamHandler( 181 static jlong CreateTestUploadDataStreamHandler(
182 JNIEnv* env, 182 JNIEnv* env,
183 const JavaParamRef<jobject>& jtest_upload_data_stream_handler, 183 const JavaParamRef<jobject>& jtest_upload_data_stream_handler,
184 jlong jupload_data_stream) { 184 jlong jupload_data_stream) {
185 std::unique_ptr<net::UploadDataStream> upload_data_stream( 185 std::unique_ptr<net::UploadDataStream> upload_data_stream(
186 reinterpret_cast<net::UploadDataStream*>(jupload_data_stream)); 186 reinterpret_cast<net::UploadDataStream*>(jupload_data_stream));
187 TestUploadDataStreamHandler* handler = new TestUploadDataStreamHandler( 187 TestUploadDataStreamHandler* handler = new TestUploadDataStreamHandler(
188 std::move(upload_data_stream), env, jtest_upload_data_stream_handler); 188 std::move(upload_data_stream), env, jtest_upload_data_stream_handler);
189 return reinterpret_cast<jlong>(handler); 189 return reinterpret_cast<jlong>(handler);
190 } 190 }
191 191
192 bool TestUploadDataStreamHandlerRegisterJni(JNIEnv* env) { 192 bool TestUploadDataStreamHandlerRegisterJni(JNIEnv* env) {
193 return RegisterNativesImpl(env); 193 return RegisterNativesImpl(env);
194 } 194 }
195 195
196 } // namespace cronet 196 } // namespace cronet
OLDNEW
« no previous file with comments | « components/cronet/android/test/sdch_test_util.cc ('k') | components/dom_distiller/core/distilled_page_prefs_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698