Upstream changes to enable chunked uploads.

components/cronet/android/chromium_url_request.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 "components/cronet/android/chromium_url_request.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
 #include "components/cronet/android/url_request_adapter.h"
@@ skipping 43 matching lines @@
 }
 
 // A delegate of URLRequestAdapter that delivers callbacks to the Java layer.
 class JniURLRequestAdapterDelegate
     : public URLRequestAdapter::URLRequestAdapterDelegate {
  public:
   JniURLRequestAdapterDelegate(JNIEnv* env, jobject owner) {
     owner_ = env->NewGlobalRef(owner);
   }
 
+  virtual void OnAppendChunkCompleted(URLRequestAdapter* request) OVERRIDE {
+    JNIEnv* env = base::android::AttachCurrentThread();
+    cronet::Java_ChromiumUrlRequest_onAppendChunkCompleted(env, owner_);
+  }
+
   virtual void OnResponseStarted(URLRequestAdapter* request) OVERRIDE {
     JNIEnv* env = base::android::AttachCurrentThread();
     cronet::Java_ChromiumUrlRequest_onResponseStarted(env, owner_);
   }
 
   virtual void OnBytesRead(URLRequestAdapter* request) OVERRIDE {
     int bytes_read = request->bytes_read();
     if (bytes_read != 0) {
       JNIEnv* env = base::android::AttachCurrentThread();
       base::android::ScopedJavaLocalRef<jobject> java_buffer(
@@ skipping 118 matching lines @@
                              jlong urlRequestAdapter,
                              jstring content_type,
                              jlong content_length) {
   URLRequestAdapter* request =
       reinterpret_cast<URLRequestAdapter*>(urlRequestAdapter);
   SetPostContentType(env, request, content_type);
 
   request->SetUploadChannel(env, content_length);
 }
 
+static void EnableChunkedUpload(JNIEnv* env,
+                                jobject jcaller,
+                                jlong urlRequestAdapter,
+                                jstring content_type) {
+  URLRequestAdapter* request =
+      reinterpret_cast<URLRequestAdapter*>(urlRequestAdapter);
+  SetPostContentType(env, request, content_type);
+  request->EnableChunkedUpload();
+}
+
+static void AppendChunkToUpload(JNIEnv* env,
+                                jobject jcaller,
+                                jlong urlRequestAdapter,
+                                jobject chunk_byte_buffer,
+                                jint chunk_size,
+                                jboolean is_last_chunk) {
+  URLRequestAdapter* request =
+      reinterpret_cast<URLRequestAdapter*>(urlRequestAdapter);
+  if (request != NULL && chunk_byte_buffer != NULL) {
+    void* chunk = env->GetDirectBufferAddress(chunk_byte_buffer);
+    request->AppendChunkToUpload(
+        reinterpret_cast<const char*>(chunk), chunk_size, is_last_chunk);
+  }
+}
+
 /* synchronized */
 static void Start(JNIEnv* env, jobject object, jlong urlRequestAdapter) {
   URLRequestAdapter* request =
       reinterpret_cast<URLRequestAdapter*>(urlRequestAdapter);
   if (request != NULL) {
     request->Start();
   }
 }
 
 /* synchronized */
@@ skipping 149 matching lines @@
 
   // Some implementations (notably HttpURLConnection) include a mapping for the
   // null key; in HTTP's case, this maps to the HTTP status line.
   ScopedJavaLocalRef<jstring> status_line =
       ConvertUTF8ToJavaString(env, headers->GetStatusLine());
   Java_ChromiumUrlRequest_onAppendResponseHeader(
       env, object, headersMap, NULL, status_line.Release());
 }
 
 }  // namespace cronet