Upstream missing changes from HttpUrlRequest interface and...

Upstream missing changes from HttpUrlRequest interface and HttpUrlConnectionUrlRequest implementation.

BUG=390267

Review URL: https://codereview.chromium.org/382193002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282973 0039d316-1c4b-4281-b951-d872f2087c98

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

@@ -14,10 +14,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.ProtocolException;
 import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutorService;
@@ -55,6 +57,8 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
 
     private int mContentLength;
 
+    private int mUploadContentLength;
+
     private long mContentLengthLimit;
 
     private boolean mCancelIfContentLengthOverLimit;
@@ -79,6 +83,8 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
 
     private boolean mCanceled;
 
+    private String mMethod;
+
     private InputStream mResponseStream;
 
     private final Object mLock;
@@ -162,11 +168,27 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
     public void setUploadChannel(String contentType,
             ReadableByteChannel channel, long contentLength) {
         validateNotStarted();
+        if (contentLength > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException(
+                "Upload contentLength is too big.");
+        }
+        mUploadContentLength = (int)contentLength;
         mPostContentType = contentType;
         mPostDataChannel = channel;
         mPostData = null;
     }
 
+
+    @Override
+    public void setHttpMethod(String method) {
+        validateNotStarted();
+        if (!("PUT".equals(method) || "POST".equals(method))) {
+            throw new IllegalArgumentException(
+                "Only PUT and POST are allowed.");
+        }
+        mMethod = method;
+    }
+
     @Override
     public void start() {
         getExecutor().execute(new Runnable() {
@@ -188,6 +210,16 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
 
             URL url = new URL(mUrl);
             mConnection = (HttpURLConnection)url.openConnection();
+            // If configured, use the provided http verb.
+            if (mMethod != null) {
+                try {
+                    mConnection.setRequestMethod(mMethod);
+                } catch (ProtocolException e) {
+                    // Since request hasn't started earlier, it
+                    // must be an illegal HTTP verb.
+                    throw new IllegalArgumentException(e);
+                }
+            }
             mConnection.setConnectTimeout(CONNECT_TIMEOUT);
             mConnection.setReadTimeout(READ_TIMEOUT);
             mConnection.setInstanceFollowRedirects(true);
@@ -290,7 +322,7 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
                 uploadStream = mConnection.getOutputStream();
                 uploadStream.write(mPostData);
             } else {
-                mConnection.setChunkedStreamingMode(MAX_CHUNK_SIZE);
+                mConnection.setFixedLengthStreamingMode(mUploadContentLength);
                 uploadStream = mConnection.getOutputStream();
                 byte[] bytes = new byte[MAX_CHUNK_SIZE];
                 ByteBuffer byteBuffer = ByteBuffer.wrap(bytes);
@@ -450,7 +482,14 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
         if (mConnection == null) {
             throw new IllegalStateException("Response headers not available");
         }
-        return mConnection.getHeaderField(name);
+        Map<String, List<String>> headerFields = mConnection.getHeaderFields();
+        if (headerFields != null) {
+            List<String> headerValues = headerFields.get(name);
+            if (headerValues != null) {
+                return TextUtils.join(", ", headerValues);
+            }
+        }
+        return null;
     }
 
     private void validateNotStarted() {

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

@@ -70,6 +70,17 @@ public interface HttpUrlRequest {
     void setUploadChannel(String contentType, ReadableByteChannel channel,
                           long contentLength);
 
+    /**
+     * Sets the HTTP method verb to use for this request. Currently can only be
+     * "POST" or "PUT".
+     *
+     * <p>The default when this method is not called is "GET" if the request has
+     * no body or "POST" if it does.
+     *
+     * @param method Either "POST" or "PUT".
+     */
+    void setHttpMethod(String method);
+
     /**
      * Start executing the request.
      * <p>

components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java

@@ -206,7 +206,7 @@ public class CronetSampleActivity extends Activity {
         return null;
     }
 
-    private void applyCommandLineToRequest(UrlRequest request) {
+    private void applyCommandLineToHttpUrlRequest(HttpUrlRequest request) {
         String postData = getCommandLineArg(POST_DATA_KEY);
         if (postData != null) {
             InputStream dataStream = new ByteArrayInputStream(
@@ -214,6 +214,7 @@ public class CronetSampleActivity extends Activity {
             ReadableByteChannel dataChannel = Channels.newChannel(dataStream);
             request.setUploadChannel("text/plain", dataChannel,
                     postData.length());
+            request.setHttpMethod("POST");
         }
     }
 
@@ -224,12 +225,24 @@ public class CronetSampleActivity extends Activity {
 
         HashMap<String, String> headers = new HashMap<String, String>();
         HttpUrlRequestListener listener = new SampleHttpUrlRequestListener();
-
         HttpUrlRequest request = mRequestFactory.createRequest(
                 url, UrlRequestPriority.MEDIUM, headers, listener);
+        applyCommandLineToHttpUrlRequest(request);
         request.start();
     }
 
+    private void applyCommandLineToUrlRequest(UrlRequest request) {
+        String postData = getCommandLineArg(POST_DATA_KEY);
+        if (postData != null) {
+            InputStream dataStream = new ByteArrayInputStream(
+                    postData.getBytes());
+            ReadableByteChannel dataChannel = Channels.newChannel(dataStream);
+            request.setUploadChannel("text/plain", dataChannel,
+                    postData.length());
+            request.setHttpMethod("POST");
+        }
+    }
+
     public void startWithURL_UrlRequest(String url) {
         Log.i(TAG, "Cronet started: " + url);
         mUrl = url;
@@ -239,7 +252,7 @@ public class CronetSampleActivity extends Activity {
         WritableByteChannel sink = Channels.newChannel(System.out);
         UrlRequest request = new SampleRequest(mRequestContext, url,
                 UrlRequestPriority.MEDIUM, headers, sink);
-        applyCommandLineToRequest(request);
+        applyCommandLineToUrlRequest(request);
         request.start();
     }