Fix a pair of Cronet upload bugs and add tests.

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index d33f982c193f0038b7b95dd80e2c4188970f606c..ecf374cdf87bd86a1cb2793be2d8b4015a9c9a22 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -412,6 +412,7 @@
           'sources': [
             'cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestUtil.java',
             'cronet/android/test/src/org/chromium/cronet_test_apk/MockUrlRequestJobUtil.java',
+            'cronet/android/test/src/org/chromium/cronet_test_apk/UploadTestServer.java',
           ],
           'variables': {
             'jni_gen_package': 'cronet_tests',
@@ -425,6 +426,8 @@
             'cronet/android/test/cronet_test_jni.cc',
             'cronet/android/test/mock_url_request_job_util.cc',
             'cronet/android/test/mock_url_request_job_util.h',
+            'cronet/android/test/upload_test_server.cc',
+            'cronet/android/test/upload_test_server.h',
             '../net/base/directory_lister.cc',
             '../net/base/directory_lister.h',
             '../net/url_request/url_request_file_job.cc',