Fix a pair of Cronet upload bugs and add tests.

components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java

 // 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.net;
 
 import android.util.Log;
 
 import org.apache.http.conn.ConnectTimeoutException;
 import org.chromium.base.CalledByNative;
@@ skipping 301 matching lines @@
         synchronized (mLock) {
             if (mCanceled) {
                 return;
             }
 
             validateNotStarted();
             validateNotRecycled();
 
             mStarted = true;
 
-            String method = mMethod;
-            if (method == null &&
-                    ((mUploadData != null && mUploadData.length > 0) ||
-                      mUploadChannel != null || mChunkedUpload)) {
-                // Default to POST if there is data to upload but no method was
-                // specified.
-                method = "POST";
-            }
-
-            if (method != null) {
-                nativeSetMethod(mUrlRequestAdapter, method);
-            }
-
             if (mHeaders != null && !mHeaders.isEmpty()) {
                 for (Entry<String, String> entry : mHeaders.entrySet()) {
                     nativeAddHeader(mUrlRequestAdapter, entry.getKey(),
                             entry.getValue());
                 }
             }
 
             if (mAdditionalHeaders != null) {
                 for (Entry<String, String> entry :
                         mAdditionalHeaders.entrySet()) {
                     nativeAddHeader(mUrlRequestAdapter, entry.getKey(),
                             entry.getValue());
                 }
             }
 
             if (mUploadData != null && mUploadData.length > 0) {
                 nativeSetUploadData(mUrlRequestAdapter, mUploadContentType,
                                     mUploadData);
             } else if (mUploadChannel != null) {
                 nativeSetUploadChannel(mUrlRequestAdapter, mUploadContentType,
                                        mUploadContentLength);
             } else if (mChunkedUpload) {
                 nativeEnableChunkedUpload(mUrlRequestAdapter,
                                           mUploadContentType);
             }
 
+            // Note:  The above functions to set the upload body also set the
+            // method to POST, behind the scenes, so if mMethod is null but
+            // there's an upload body, the method will default to POST.
+            if (mMethod != null) {
+                nativeSetMethod(mUrlRequestAdapter, mMethod);
+            }
+
             nativeStart(mUrlRequestAdapter);
           }
     }
 
     @Override
     public void cancel() {
         synchronized (mLock) {
             if (mCanceled) {
                 return;
             }
@@ skipping 328 matching lines @@
 
     private native void nativeGetAllHeaders(long urlRequestAdapter,
             ResponseHeadersMap headers);
 
     private native String nativeGetNegotiatedProtocol(long urlRequestAdapter);
 
     // Explicit class to work around JNI-generator generics confusion.
     private class ResponseHeadersMap extends HashMap<String, List<String>> {
     }
 }