Fix a pair of Cronet upload bugs and add tests.

components/cronet.gypi

 # 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.
 
 {
   'conditions': [
     ['OS=="android" and use_icu_alternatives_on_android==1', {
       # TODO(mef): Figure out what needs to be done for gn script.
       'targets': [
         {
@@ skipping 394 matching lines @@
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'cronet_tests_jni_headers',
           'type': 'none',
           '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',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libcronet_tests',
           'type': 'shared_library',
           'sources': [
             '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',
             '../net/url_request/url_request_file_job.h',
           ],
           'dependencies': [
             'cronet_static',
             'cronet_tests_jni_headers',
             '../base/base.gyp:base',
             '../net/net.gyp:net',
@@ skipping 47 matching lines @@
             'java_in_dir': 'cronet/android/test/javatests',
             'resource_dir': 'cronet/android/test/res',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ],
 }