OLD | NEW |
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/cronet_upload_data_stream_adapter.h" | 5 #include "components/cronet/android/cronet_upload_data_stream_adapter.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
10 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
11 #include "base/bind.h" | 12 #include "base/bind.h" |
12 #include "base/logging.h" | 13 #include "base/logging.h" |
13 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
14 #include "base/thread_task_runner_handle.h" | 15 #include "base/thread_task_runner_handle.h" |
15 #include "components/cronet/android/cronet_url_request_adapter.h" | 16 #include "components/cronet/android/cronet_url_request_adapter.h" |
16 #include "jni/CronetUploadDataStream_jni.h" | 17 #include "jni/CronetUploadDataStream_jni.h" |
17 | 18 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 CronetURLRequestAdapter* request_adapter = | 116 CronetURLRequestAdapter* request_adapter = |
116 reinterpret_cast<CronetURLRequestAdapter*>(jcronet_url_request_adapter); | 117 reinterpret_cast<CronetURLRequestAdapter*>(jcronet_url_request_adapter); |
117 DCHECK(request_adapter != nullptr); | 118 DCHECK(request_adapter != nullptr); |
118 | 119 |
119 CronetUploadDataStreamAdapter* adapter = | 120 CronetUploadDataStreamAdapter* adapter = |
120 new CronetUploadDataStreamAdapter(env, jupload_data_stream); | 121 new CronetUploadDataStreamAdapter(env, jupload_data_stream); |
121 | 122 |
122 scoped_ptr<CronetUploadDataStream> upload_data_stream( | 123 scoped_ptr<CronetUploadDataStream> upload_data_stream( |
123 new CronetUploadDataStream(adapter, jlength)); | 124 new CronetUploadDataStream(adapter, jlength)); |
124 | 125 |
125 request_adapter->SetUpload(upload_data_stream.Pass()); | 126 request_adapter->SetUpload(std::move(upload_data_stream)); |
126 | 127 |
127 return reinterpret_cast<jlong>(adapter); | 128 return reinterpret_cast<jlong>(adapter); |
128 } | 129 } |
129 | 130 |
130 static jlong CreateAdapterForTesting( | 131 static jlong CreateAdapterForTesting( |
131 JNIEnv* env, | 132 JNIEnv* env, |
132 const JavaParamRef<jobject>& jupload_data_stream) { | 133 const JavaParamRef<jobject>& jupload_data_stream) { |
133 CronetUploadDataStreamAdapter* adapter = | 134 CronetUploadDataStreamAdapter* adapter = |
134 new CronetUploadDataStreamAdapter(env, jupload_data_stream); | 135 new CronetUploadDataStreamAdapter(env, jupload_data_stream); |
135 return reinterpret_cast<jlong>(adapter); | 136 return reinterpret_cast<jlong>(adapter); |
136 } | 137 } |
137 | 138 |
138 static jlong CreateUploadDataStreamForTesting( | 139 static jlong CreateUploadDataStreamForTesting( |
139 JNIEnv* env, | 140 JNIEnv* env, |
140 const JavaParamRef<jobject>& jupload_data_stream, | 141 const JavaParamRef<jobject>& jupload_data_stream, |
141 jlong jlength, | 142 jlong jlength, |
142 jlong jadapter) { | 143 jlong jadapter) { |
143 CronetUploadDataStreamAdapter* adapter = | 144 CronetUploadDataStreamAdapter* adapter = |
144 reinterpret_cast<CronetUploadDataStreamAdapter*>(jadapter); | 145 reinterpret_cast<CronetUploadDataStreamAdapter*>(jadapter); |
145 CronetUploadDataStream* upload_data_stream = | 146 CronetUploadDataStream* upload_data_stream = |
146 new CronetUploadDataStream(adapter, jlength); | 147 new CronetUploadDataStream(adapter, jlength); |
147 return reinterpret_cast<jlong>(upload_data_stream); | 148 return reinterpret_cast<jlong>(upload_data_stream); |
148 } | 149 } |
149 | 150 |
150 } // namespace cronet | 151 } // namespace cronet |
OLD | NEW |