Fix UploadDataProviders.create(byte[], offset, count)

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java
index 7a9eb69cec031c6d67ba92ac48a445a7540c3566..1d6d923f1b4aae2293eda79c551de6732c5a3286 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java
@@ -206,4 +206,29 @@ public class UploadDataProvidersTest extends CronetTestBase {
         assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
         assertEquals(exceptionMessage, callback.mError.getCause().getMessage());
     }
+
+    @SmallTest
+    @Feature({"Cronet"})
+    // Tests that creating a ByteBufferUploadProvider using a byte array with an
+    // offset gives a ByteBuffer with position 0. crbug.com/603124.
+    public void testCreateByteBufferUploadWithArrayOffset() throws Exception {
+        TestUrlRequestCallback callback = new TestUrlRequestCallback();
+        // This URL will trigger a rewind().
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback,
+                        callback.getExecutor(), mTestFramework.mCronetEngine);
+        builder.addHeader("Content-Type", "useless/string");
+        byte[] uploadData = LOREM.getBytes("UTF-8");
+        int offset = 5;
+        byte[] uploadDataWithPadding = new byte[uploadData.length + offset];
+        System.arraycopy(uploadData, 0, uploadDataWithPadding, offset, uploadData.length);
+        UploadDataProvider dataProvider =
+                UploadDataProviders.create(uploadDataWithPadding, offset, uploadData.length);
+        builder.setUploadDataProvider(dataProvider, callback.getExecutor());
+        UrlRequest urlRequest = builder.build();
+        urlRequest.start();
+        callback.blockForDone();
+        assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
+        assertEquals(LOREM, callback.mResponseAsString);
+    }
 }