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

Unified Diff: components/cronet/android/url_request_adapter.cc

Issue 470443005: Cronet modifications to support AGSA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Small changes. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: components/cronet/android/url_request_adapter.cc
diff --git a/components/cronet/android/url_request_adapter.cc b/components/cronet/android/url_request_adapter.cc
index 8ab88a2f3cd766629e0033c3f231381992528f13..d6b84791608bd540ddbc6454189a0e1279234e29 100644
--- a/components/cronet/android/url_request_adapter.cc
+++ b/components/cronet/android/url_request_adapter.cc
@@ -23,15 +23,16 @@ URLRequestAdapter::URLRequestAdapter(URLRequestContextAdapter* context,
url_request_(NULL),
read_buffer_(new net::GrowableIOBuffer()),
bytes_read_(0),
total_bytes_read_(0),
error_code_(0),
http_status_code_(0),
canceled_(false),
- expected_size_(0) {
+ expected_size_(0),
+ chunked_upload_(false) {
context_ = context;
delegate_ = delegate;
url_ = url;
priority_ = priority;
}
URLRequestAdapter::~URLRequestAdapter() {
@@ -58,14 +59,30 @@ void URLRequestAdapter::SetUploadContent(const char* bytes, int bytes_len) {
void URLRequestAdapter::SetUploadChannel(JNIEnv* env, int64 content_length) {
scoped_ptr<net::UploadElementReader> reader(
new WrappedChannelElementReader(delegate_, content_length));
upload_data_stream_.reset(
net::UploadDataStream::CreateWithReader(reader.Pass(), 0));
}
+void URLRequestAdapter::EnableChunkedUpload() {
+ chunked_upload_ = true;
+}
+
+void URLRequestAdapter::AppendChunk(const char* bytes, int bytes_len,
+ bool is_last_chunk) {
+ VLOG(1) << "AppendChunk, len: " << bytes_len << ", last: " << is_last_chunk;
+ context_->GetNetworkTaskRunner()->PostTask(
+ FROM_HERE,
+ base::Bind(&URLRequestAdapter::OnAppendChunk,
+ base::Unretained(this),
+ bytes,
+ bytes_len,
+ is_last_chunk));
+}
+
std::string URLRequestAdapter::GetHeader(const std::string& name) const {
std::string value;
if (url_request_ != NULL) {
url_request_->GetResponseHeaderByName(name, &value);
}
return value;
}
@@ -73,21 +90,35 @@ std::string URLRequestAdapter::GetHeader(const std::string& name) const {
net::HttpResponseHeaders* URLRequestAdapter::GetResponseHeaders() const {
if (url_request_ == NULL) {
return NULL;
}
return url_request_->response_headers();
}
+bool URLRequestAdapter::GetFullRequestHeaders(
+ net::HttpRequestHeaders* headers) const {
+ if (url_request_ == NULL) {
+ return false;
+ }
+ return url_request_->GetFullRequestHeaders(headers);
+}
+
void URLRequestAdapter::Start() {
context_->GetNetworkTaskRunner()->PostTask(
FROM_HERE,
base::Bind(&URLRequestAdapter::OnInitiateConnection,
base::Unretained(this)));
}
+void URLRequestAdapter::OnAppendChunk(const char* bytes, int bytes_len,
+ bool is_last_chunk) {
+ url_request_->AppendChunkToUpload(bytes, bytes_len, is_last_chunk);
+ delegate_->OnAppendChunkCompleted(this);
+}
+
void URLRequestAdapter::OnInitiateConnection() {
if (canceled_) {
return;
}
VLOG(1) << "Starting chromium request: "
<< url_.possibly_invalid_spec().c_str()
@@ -102,16 +133,19 @@ void URLRequestAdapter::OnInitiateConnection() {
if (!headers_.HasHeader(net::HttpRequestHeaders::kUserAgent)) {
std::string user_agent;
user_agent = context_->GetUserAgent(url_);
url_request_->SetExtraRequestHeaderByName(
net::HttpRequestHeaders::kUserAgent, user_agent, true /* override */);
}
- if (upload_data_stream_)
+ if (upload_data_stream_) {
url_request_->set_upload(upload_data_stream_.Pass());
+ } else if (chunked_upload_) {
+ url_request_->EnableChunkedUpload();
+ }
url_request_->SetPriority(priority_);
url_request_->Start();
}
void URLRequestAdapter::Cancel() {

Powered by Google App Engine
This is Rietveld 408576698