Fix a pair of Cronet upload bugs and add tests.

components/cronet/android/test/upload_test_server.h

Index: components/cronet/android/test/upload_test_server.h
diff --git a/components/cronet/android/test/mock_url_request_job_util.h b/components/cronet/android/test/upload_test_server.h
similarity index 55%
copy from components/cronet/android/test/mock_url_request_job_util.h
copy to components/cronet/android/test/upload_test_server.h
index 660476a12530108a9d570de89e6c9762d2b786fc..59eb45c1c245e3183e911f2bfbbffa1b62594454 100644
--- a/components/cronet/android/test/mock_url_request_job_util.h
+++ b/components/cronet/android/test/upload_test_server.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CRONET_MOCK_URL_REQUEST_JOB_UTIL_H_
-#define CRONET_MOCK_URL_REQUEST_JOB_UTIL_H_
+#ifndef CRONET_UPLOAD_TEST_SERVER_H_
+#define CRONET_UPLOAD_TEST_SERVER_H_
 
 #include <jni.h>
 
 namespace cronet {
 
-bool RegisterMockUrlRequestJobUtil(JNIEnv* env);
+bool RegisterUploadTestServer(JNIEnv* env);
 
 }  // namespace cronet
 
-#endif  // CRONET_MOCK_URL_REQUEST_JOB_UTIL_H_
+#endif  // CRONET_UPLOAD_TEST_SERVER_H_