Merge 271992 "Upstream changes to:"

components/cronet/android/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.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.content.Context;
 import android.text.TextUtils;
 
 import org.apache.http.HttpStatus;
@@ skipping 203 matching lines @@
 
             mHttpStatusCode = mConnection.getResponseCode();
             mContentType = mConnection.getContentType();
             mContentLength = mConnection.getContentLength();
             if (mContentLengthLimit > 0 && mContentLength > mContentLengthLimit
                     && mCancelIfContentLengthOverLimit) {
                 onContentLengthOverLimit();
                 return;
             }
 
+            mListener.onResponseStarted(this);
+
             mResponseStream = isError(mHttpStatusCode) ? mConnection
                     .getErrorStream()
                     : stream;
 
             if (mResponseStream != null
                     && "gzip".equals(mConnection.getContentEncoding())) {
                 mResponseStream = new GZIPInputStream(mResponseStream);
                 mContentLength = -1;
             }
 
             if (mOffset != 0) {
                 // The server may ignore the request for a byte range.
                 if (mHttpStatusCode == HttpStatus.SC_OK) {
                     if (mContentLength != -1) {
                         mContentLength -= mOffset;
                     }
                     mSkippingToOffset = true;
                 } else {
                     mSize = mOffset;
                 }
             }
 
             if (mResponseStream != null) {
                 readingResponse = true;
                 readResponseAsync();
             }
         } catch (IOException e) {
             mException = e;
         } finally {
+            if (mPostDataChannel != null) {
+                try {
+                    mPostDataChannel.close();
+                } catch (IOException e) {
+                    // Ignore
+                }
+            }
+
             // Don't call onRequestComplete yet if we are reading the response
             // on a separate thread
             if (!readingResponse) {
                 mListener.onRequestComplete(this);
             }
         }
     }
 
     private void uploadData() throws IOException {
         mConnection.setDoOutput(true);
@@ skipping 155 matching lines @@
     @Override
     public long getContentLength() {
         return mContentLength;
     }
 
     @Override
     public String getContentType() {
         return mContentType;
     }
 
+
+    @Override
+    public String getHeader(String name) {
+        if (mConnection == null) {
+            throw new IllegalStateException("Response headers not available");
+        }
+        return mConnection.getHeaderField(name);
+    }
+
     private void validateNotStarted() {
         if (mStarted) {
             throw new IllegalStateException("Request already started");
         }
     }
 }