Cronet modifications to support AGSA.

components/cronet/android/url_request_adapter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "url_request_adapter.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "components/cronet/android/url_request_context_adapter.h"
 #include "components/cronet/android/wrapped_channel_upload_element_reader.h"
 #include "net/base/load_flags.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/http/http_status_code.h"
 
 namespace cronet {
 
 static const size_t kBufferSizeIncrement = 8192;
 
 URLRequestAdapter::URLRequestAdapter(URLRequestContextAdapter* context,
                                      URLRequestAdapterDelegate* delegate,
                                      GURL url,
                                      net::RequestPriority priority)
     : method_("GET"),
       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() {
   CHECK(url_request_ == NULL);
 }
 
@@ skipping 14 matching lines @@
       net::UploadDataStream::CreateWithReader(reader.Pass(), 0));
 }
 
 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;
 }
 
 net::HttpResponseHeaders* URLRequestAdapter::GetResponseHeaders() const {
   if (url_request_ == NULL) {
     return NULL;
   }
   return url_request_->response_headers();
 }
 
+bool URLRequestAdapter::GetFullRequestHeaders(

[mef, 2014/08/15 15:42:52]

Do you need this on the Java side?

[mdumitrescu, 2014/08/15 15:50:20]

I was looking into this. It seems we don't right now so I might remove this (or
add it to the java api).

+    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) {

[mef, 2014/08/15 13:30:22]

nit: align with 'const'.

[mdumitrescu, 2014/08/15 15:23:13]

Done.

+  if (url_request_ != NULL) {
+    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()
           << " priority: " << RequestPriorityToString(priority_);
   url_request_ = new net::URLRequest(
       url_, net::DEFAULT_PRIORITY, this, context_->GetURLRequestContext());
   url_request_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
                              net::LOAD_DO_NOT_SAVE_COOKIES |
                              net::LOAD_DO_NOT_SEND_COOKIES);
   url_request_->set_method(method_);
   url_request_->SetExtraRequestHeaders(headers_);
   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_)
-    url_request_->set_upload(upload_data_stream_.Pass());

[mef, 2014/08/15 13:30:22]

Pass() is fine here.

[mdumitrescu, 2014/08/15 15:23:13]

Oops. Unintended change.

+  if (upload_data_stream_) {
+    url_request_->set_upload(make_scoped_ptr(upload_data_stream_.release()));
+  } else if (chunked_upload_) {
+    url_request_->EnableChunkedUpload();
+  }
 
   url_request_->SetPriority(priority_);
 
   url_request_->Start();
 }
 
 void URLRequestAdapter::Cancel() {
   if (canceled_) {
     return;
   }
@@ skipping 135 matching lines @@
 
   delegate_->OnBytesRead(this);
   delegate_->OnRequestFinished(this);
 }
 
 unsigned char* URLRequestAdapter::Data() const {
   return reinterpret_cast<unsigned char*>(read_buffer_->StartOfBuffer());
 }
 
 }  // namespace cronet