[Cronet] Enable chunked upload in CronetUrlRequest

components/cronet/android/test/javatests/src/org/chromium/net/TestDataProvider.java

 // Copyright 2015 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.
 
 package org.chromium.net;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.concurrent.Executor;
@@ skipping 101 matching lines @@
         assertIdle();
 
         if (maybeFailRead(currentReadCall, uploadDataSink)) {
             mFailed = true;
             return;
         }
 
         mReadPending = true;
         mStarted = true;
 
-        final boolean finalChunk = (mChunked && mNextRead == mReads.size());
+        final boolean finalChunk =
+                (mChunked && ((mNextRead == mReads.size() - 1 && mReads.get(mNextRead).length == 0)
+                                     || mNextRead == mReads.size()));

[mmenke, 2015/02/26 22:30:19]

This should actually just be:

final boolean finalChunk = (mChunked && mNextRead == mReads.size() - 1);

And further down, the "else if (!finalChunk)" should just be "else".

The original code always appended an empty final chunk to the end, when it
should have just set finalChunk to true for the last element in mReads.  Think
the original API had a special call to indicate a chunked upload was sent, but
then I changed that (Or I was considering that?).  Anyways, that and your two
tests mean we test both cases.  You'll have to update the number of expected
reads in one of them.

[xunjieli, 2015/02/26 22:53:53]

I see. That totally makes sense. Was a little confused about the extra call.
Done.

         if (mNextRead < mReads.size()) {
             if ((byteBuffer.limit() - byteBuffer.position())
                     < mReads.get(mNextRead).length) {
                 throw new IllegalStateException(
                         "Read buffer smaller than expected.");
             }
             byteBuffer.put(mReads.get(mNextRead));
             ++mNextRead;
         } else if (!finalChunk) {
             throw new IllegalStateException(
@@ skipping 103 matching lines @@
                                 "Async rewind failure"));
                     }
                 };
                 mExecutor.execute(errorRunnable);
                 return true;
             default:
                 return false;
         }
     }
 }