SetUploadData now throws an exception if contentType is null.

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 196 matching lines @@
     /**
      * Sets data to upload as part of a POST or PUT request.
      *
      * @param contentType MIME type of the upload content or null if this is not
      *            an upload.
      * @param data The content that needs to be uploaded.
      */
     public void setUploadData(String contentType, byte[] data) {
         synchronized (mLock) {
             validateNotStarted();
+            validateContentType(contentType);
             mUploadContentType = contentType;
             mUploadData = data;
             mUploadChannel = null;
             mChunkedUpload = false;
         }
     }
 
     /**
      * Sets a readable byte channel to upload as part of a POST or PUT request.
      *
      * @param contentType MIME type of the upload content or null if this is not
      *            an upload request.
      * @param channel The channel to read to read upload data from if this is an
      *            upload request.
      * @param contentLength The length of data to upload.
      */
     public void setUploadChannel(String contentType,
             ReadableByteChannel channel, long contentLength) {
         synchronized (mLock) {
             validateNotStarted();
+            validateContentType(contentType);
             mUploadContentType = contentType;
             mUploadChannel = channel;
             mUploadContentLength = contentLength;
             mUploadData = null;
             mChunkedUpload = false;
         }
     }
 
     /**
      * Sets this request up for chunked uploading. To upload data call
      * {@link #appendChunk(ByteBuffer, boolean)} after {@link #start()}.
      *
      * @param contentType MIME type of the post content or null if this is not a
      *            POST request.
      */
     public void setChunkedUpload(String contentType) {
         synchronized (mLock) {
             validateNotStarted();
+            validateContentType(contentType);
             mUploadContentType = contentType;
             mChunkedUpload = true;
             mUploadData = null;
             mUploadChannel = null;
         }
     }
 
     /**
      * Uploads a new chunk. Must have called {@link #setChunkedUpload(String)}
      * and {@link #start()}.
@@ skipping 183 matching lines @@
             throw new IllegalStateException("Request already started");
         }
     }
 
     private void validateHeadersAvailable() {
         if (!mHeadersAvailable) {
             throw new IllegalStateException("Response headers not available");
         }
     }
 
+    private void validateContentType(String contentType) {
+        if (contentType == null) {
+            throw new NullPointerException("contentType is required");
+        }
+    }
+
     // Private methods called by native library.
 
     /**
      * If @CalledByNative method throws an exception, request gets cancelled
      * and exception could be retrieved from request using getException().
      */
     private void onCalledByNativeException(Exception e) {
         mSinkException = new IOException(
                 "CalledByNative method has thrown an exception", e);
         Log.e(ChromiumUrlRequestContext.LOG_TAG,
@@ skipping 207 matching lines @@
 
     private native String nativeGetHeader(long urlRequestAdapter, String name);
 
     private native void nativeGetAllHeaders(long urlRequestAdapter,
             ResponseHeadersMap headers);
 
     // Explicit class to work around JNI-generator generics confusion.
     private class ResponseHeadersMap extends HashMap<String, List<String>> {
     }
 }