Merge 271992 "Upstream changes to:"

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

Index: components/cronet/android/java/src/org/chromium/net/UrlRequest.java
===================================================================
--- components/cronet/android/java/src/org/chromium/net/UrlRequest.java	(revision 276124)
+++ components/cronet/android/java/src/org/chromium/net/UrlRequest.java	(working copy)
@@ -44,6 +44,7 @@
     private volatile boolean mCanceled;
     private volatile boolean mRecycled;
     private volatile boolean mFinished;
+    private boolean mHeadersAvailable;
     private String mContentType;
     private long mContentLength;
     private Semaphore mAppendChunkSemaphore;
@@ -137,37 +138,47 @@
     }
 
     public void start() {
-        synchronized (mLock) {
-            if (mCanceled) {
-                return;
-            }
+        try {
+            synchronized (mLock) {
+                if (mCanceled) {
+                    return;
+                }
 
-            validateNotStarted();
-            validateNotRecycled();
+                validateNotStarted();
+                validateNotRecycled();
 
-            mStarted = true;
+                mStarted = true;
 
-            if (mHeaders != null && !mHeaders.isEmpty()) {
-                for (Entry<String, String> entry : mHeaders.entrySet()) {
-                    nativeAddHeader(mUrlRequestPeer, entry.getKey(),
-                            entry.getValue());
+                if (mHeaders != null && !mHeaders.isEmpty()) {
+                    for (Entry<String, String> entry : mHeaders.entrySet()) {
+                        nativeAddHeader(mUrlRequestPeer, entry.getKey(),
+                                entry.getValue());
+                    }
                 }
+
+                if (mAdditionalHeaders != null && !mAdditionalHeaders.isEmpty()) {
+                    for (Entry<String, String> entry :
+                            mAdditionalHeaders.entrySet()) {
+                        nativeAddHeader(mUrlRequestPeer, entry.getKey(),
+                                entry.getValue());
+                    }
+                }
+
+                nativeStart(mUrlRequestPeer);
             }
 
-            if (mAdditionalHeaders != null && !mAdditionalHeaders.isEmpty()) {
-                for (Entry<String, String> entry :
-                        mAdditionalHeaders.entrySet()) {
-                    nativeAddHeader(mUrlRequestPeer, entry.getKey(),
-                            entry.getValue());
+            if (mPostBodyChannel != null) {
+                uploadFromChannel(mPostBodyChannel);
+            }
+        } finally {
+            if (mPostBodyChannel != null) {
+                try {
+                    mPostBodyChannel.close();
+                } catch (IOException e) {
+                    // Ignore
                 }
             }
-
-            nativeStart(mUrlRequestPeer);
         }
-
-        if (mPostBodyChannel != null) {
-            uploadFromChannel(mPostBodyChannel);
-        }
     }
 
     /**
@@ -217,12 +228,6 @@
         } catch (InterruptedException e) {
             mSinkException = new IOException(e);
             cancel();
-        } finally {
-            try {
-                mPostBodyChannel.close();
-            } catch (IOException ignore) {
-                ;
-            }
         }
     }
 
@@ -303,6 +308,11 @@
         return mContentType;
     }
 
+    public String getHeader(String name) {
+        validateHeadersAvailable();
+        return nativeGetHeader(mUrlRequestPeer, name);
+    }
+
     /**
      * A callback invoked when appending a chunk to the request has completed.
      */
@@ -318,6 +328,7 @@
     protected void onResponseStarted() {
         mContentType = nativeGetContentType(mUrlRequestPeer);
         mContentLength = nativeGetContentLength(mUrlRequestPeer);
+        mHeadersAvailable = true;
     }
 
     /**
@@ -390,6 +401,13 @@
         }
     }
 
+
+    private void validateHeadersAvailable() {
+        if (!mHeadersAvailable) {
+            throw new IllegalStateException("Response headers not available");
+        }
+    }
+
     public String getUrl() {
         return mUrl;
     }
@@ -424,4 +442,6 @@
     private native String nativeGetContentType(long urlRequestPeer);
 
     private native long nativeGetContentLength(long urlRequestPeer);
+
+    private native String nativeGetHeader(long urlRequestPeer, String name);
 }