| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "cronet_url_request_adapter.h" | 5 #include "components/cronet/android/cronet_url_request_adapter.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <utility> |
| 8 #include <vector> | 9 #include <vector> |
| 9 | 10 |
| 10 #include "base/bind.h" | 11 #include "base/bind.h" |
| 11 #include "base/location.h" | 12 #include "base/location.h" |
| 12 #include "base/logging.h" | 13 #include "base/logging.h" |
| 13 #include "components/cronet/android/cronet_url_request_context_adapter.h" | 14 #include "components/cronet/android/cronet_url_request_context_adapter.h" |
| 14 #include "jni/CronetUrlRequest_jni.h" | 15 #include "jni/CronetUrlRequest_jni.h" |
| 15 #include "net/base/io_buffer.h" | 16 #include "net/base/io_buffer.h" |
| 16 #include "net/base/load_flags.h" | 17 #include "net/base/load_flags.h" |
| 17 #include "net/base/net_errors.h" | 18 #include "net/base/net_errors.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 JNIEnv* env, | 141 JNIEnv* env, |
| 141 const JavaParamRef<jobject>& jcaller) { | 142 const JavaParamRef<jobject>& jcaller) { |
| 142 DCHECK(!context_->IsOnNetworkThread()); | 143 DCHECK(!context_->IsOnNetworkThread()); |
| 143 load_flags_ |= net::LOAD_DISABLE_CACHE; | 144 load_flags_ |= net::LOAD_DISABLE_CACHE; |
| 144 } | 145 } |
| 145 | 146 |
| 146 void CronetURLRequestAdapter::SetUpload( | 147 void CronetURLRequestAdapter::SetUpload( |
| 147 scoped_ptr<net::UploadDataStream> upload) { | 148 scoped_ptr<net::UploadDataStream> upload) { |
| 148 DCHECK(!context_->IsOnNetworkThread()); | 149 DCHECK(!context_->IsOnNetworkThread()); |
| 149 DCHECK(!upload_); | 150 DCHECK(!upload_); |
| 150 upload_ = upload.Pass(); | 151 upload_ = std::move(upload); |
| 151 } | 152 } |
| 152 | 153 |
| 153 void CronetURLRequestAdapter::Start(JNIEnv* env, | 154 void CronetURLRequestAdapter::Start(JNIEnv* env, |
| 154 const JavaParamRef<jobject>& jcaller) { | 155 const JavaParamRef<jobject>& jcaller) { |
| 155 DCHECK(!context_->IsOnNetworkThread()); | 156 DCHECK(!context_->IsOnNetworkThread()); |
| 156 context_->PostTaskToNetworkThread( | 157 context_->PostTaskToNetworkThread( |
| 157 FROM_HERE, base::Bind(&CronetURLRequestAdapter::StartOnNetworkThread, | 158 FROM_HERE, base::Bind(&CronetURLRequestAdapter::StartOnNetworkThread, |
| 158 base::Unretained(this))); | 159 base::Unretained(this))); |
| 159 } | 160 } |
| 160 | 161 |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 VLOG(1) << "Starting chromium request: " | 330 VLOG(1) << "Starting chromium request: " |
| 330 << initial_url_.possibly_invalid_spec().c_str() | 331 << initial_url_.possibly_invalid_spec().c_str() |
| 331 << " priority: " << RequestPriorityToString(initial_priority_); | 332 << " priority: " << RequestPriorityToString(initial_priority_); |
| 332 url_request_ = context_->GetURLRequestContext()->CreateRequest( | 333 url_request_ = context_->GetURLRequestContext()->CreateRequest( |
| 333 initial_url_, net::DEFAULT_PRIORITY, this); | 334 initial_url_, net::DEFAULT_PRIORITY, this); |
| 334 url_request_->SetLoadFlags(load_flags_); | 335 url_request_->SetLoadFlags(load_flags_); |
| 335 url_request_->set_method(initial_method_); | 336 url_request_->set_method(initial_method_); |
| 336 url_request_->SetExtraRequestHeaders(initial_request_headers_); | 337 url_request_->SetExtraRequestHeaders(initial_request_headers_); |
| 337 url_request_->SetPriority(initial_priority_); | 338 url_request_->SetPriority(initial_priority_); |
| 338 if (upload_) | 339 if (upload_) |
| 339 url_request_->set_upload(upload_.Pass()); | 340 url_request_->set_upload(std::move(upload_)); |
| 340 url_request_->Start(); | 341 url_request_->Start(); |
| 341 } | 342 } |
| 342 | 343 |
| 343 void CronetURLRequestAdapter::GetStatusOnNetworkThread( | 344 void CronetURLRequestAdapter::GetStatusOnNetworkThread( |
| 344 const base::android::ScopedJavaGlobalRef<jobject>& status_listener_ref) | 345 const base::android::ScopedJavaGlobalRef<jobject>& status_listener_ref) |
| 345 const { | 346 const { |
| 346 DCHECK(context_->IsOnNetworkThread()); | 347 DCHECK(context_->IsOnNetworkThread()); |
| 347 JNIEnv* env = base::android::AttachCurrentThread(); | 348 JNIEnv* env = base::android::AttachCurrentThread(); |
| 348 cronet::Java_CronetUrlRequest_onStatus(env, owner_.obj(), | 349 cronet::Java_CronetUrlRequest_onStatus(env, owner_.obj(), |
| 349 status_listener_ref.obj(), | 350 status_listener_ref.obj(), |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 << " on chromium request: " << initial_url_.possibly_invalid_spec(); | 412 << " on chromium request: " << initial_url_.possibly_invalid_spec(); |
| 412 JNIEnv* env = base::android::AttachCurrentThread(); | 413 JNIEnv* env = base::android::AttachCurrentThread(); |
| 413 cronet::Java_CronetUrlRequest_onError( | 414 cronet::Java_CronetUrlRequest_onError( |
| 414 env, owner_.obj(), net_error, | 415 env, owner_.obj(), net_error, |
| 415 ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(), | 416 ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(), |
| 416 request->GetTotalReceivedBytes()); | 417 request->GetTotalReceivedBytes()); |
| 417 return true; | 418 return true; |
| 418 } | 419 } |
| 419 | 420 |
| 420 } // namespace cronet | 421 } // namespace cronet |
| OLD | NEW |