Fix a pair of Cronet upload bugs and add tests.

components/cronet/android/test/src/org/chromium/cronet_test_apk/UploadTestServer.java

Index: components/cronet/android/test/src/org/chromium/cronet_test_apk/UploadTestServer.java
diff --git a/components/cronet/android/test/src/org/chromium/cronet_test_apk/UploadTestServer.java b/components/cronet/android/test/src/org/chromium/cronet_test_apk/UploadTestServer.java
new file mode 100644
index 0000000000000000000000000000000000000000..8d248870550d51fd02220a9054bc555954f53bd6
--- /dev/null
+++ b/components/cronet/android/test/src/org/chromium/cronet_test_apk/UploadTestServer.java
@@ -0,0 +1,45 @@
+// 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.
+
+package org.chromium.cronet_test_apk;
+
+import org.chromium.base.JNINamespace;
+
+/**
+ * Wrapper class to start an in-process native test server, and get URLs
+ * needed to talk to it.
+ */
+@JNINamespace("cronet")
+public final class UploadTestServer {
+    public static boolean startUploadTestServer() {
+        return nativeStartUploadTestServer();
+    }
+
+    public static void shutdownUploadTestServer() {
+        nativeShutdownUploadTestServer();
+    }
+
+    public static String getEchoBodyURL() {
+        return nativeGetEchoBodyURL();
+    }
+
+    public static String getEchoHeaderURL(String header) {
+        return nativeGetEchoHeaderURL(header);
+    }
+
+    public static String getEchoMethodURL() {
+        return nativeGetEchoMethodURL();
+    }
+
+    public static String getRedirectToEchoBody() {
+        return nativeGetRedirectToEchoBody();
+    }
+
+    private static native boolean nativeStartUploadTestServer();
+    private static native void nativeShutdownUploadTestServer();
+    private static native String nativeGetEchoBodyURL();
+    private static native String nativeGetEchoHeaderURL(String header);
+    private static native String nativeGetEchoMethodURL();
+    private static native String nativeGetRedirectToEchoBody();
+}