Update ResponseInfo to UrlResponseInfo with API review comments.

components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.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.urlconnection;
 
 import android.util.Pair;
 
 import org.chromium.base.Log;
 import org.chromium.net.CronetEngine;
-import org.chromium.net.ExtendedResponseInfo;
-import org.chromium.net.ResponseInfo;
 import org.chromium.net.UrlRequest;
 import org.chromium.net.UrlRequestException;
 import org.chromium.net.UrlRequestListener;
+import org.chromium.net.UrlResponseInfo;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
 import java.net.URL;
 import java.nio.ByteBuffer;
@@ skipping 11 matching lines @@
 public class CronetHttpURLConnection extends HttpURLConnection {
     private static final String TAG = "cr.CronetHttpURLConn";
     private static final String CONTENT_LENGTH = "Content-Length";
     private final CronetEngine mCronetEngine;
     private final MessageLoop mMessageLoop;
     private UrlRequest mRequest;
     private final List<Pair<String, String>> mRequestHeaders;
 
     private CronetInputStream mInputStream;
     private CronetOutputStream mOutputStream;
-    private ResponseInfo mResponseInfo;
+    private UrlResponseInfo mResponseInfo;
     private UrlRequestException mException;
     private boolean mOnRedirectCalled = false;
     private boolean mHasResponse = false;
 
     public CronetHttpURLConnection(URL url, CronetEngine cronetEngine) {
         super(url);
         mCronetEngine = cronetEngine;
         mMessageLoop = new MessageLoop();
         mInputStream = new CronetInputStream(this);
         mRequestHeaders = new ArrayList<Pair<String, String>>();
@@ skipping 77 matching lines @@
         List<String> values = map.get(fieldName);
         return values.get(values.size() - 1);
     }
 
     /**
      * Returns the name of the header field at the given position {@code pos}, or {@code null}
      * if there are fewer than {@code pos} fields.
      */
     @Override
     public final String getHeaderFieldKey(int pos) {
-        Pair<String, String> header = getHeaderFieldPair(pos);
+        Map.Entry<String, String> header = getHeaderFieldEntry(pos);
         if (header == null) {
             return null;
         }
-        return header.first;
+        return header.getKey();
     }
 
     /**
      * Returns the header value at the field position {@code pos} or {@code null} if the header
      * has fewer than {@code pos} fields.
      */
     @Override
     public final String getHeaderField(int pos) {
-        Pair<String, String> header = getHeaderFieldPair(pos);
+        Map.Entry<String, String> header = getHeaderFieldEntry(pos);
         if (header == null) {
             return null;
         }
-        return header.second;
+        return header.getValue();
     }
 
     /**
      * Returns an InputStream for reading data from the resource pointed by this
      * {@link java.net.URLConnection}.
      * @throws FileNotFoundException if http response code is equal or greater
      *             than {@link HTTP_BAD_REQUEST}.
      * @throws IOException If the request gets a network error or HTTP error
      *             status code, or if the caller tried to read the response body
      *             of a redirect when redirects are disabled.
@@ skipping 243 matching lines @@
             }
         }
         return -1;
     }
 
     private class CronetUrlRequestListener extends UrlRequestListener {
         public CronetUrlRequestListener() {
         }
 
         @Override
-        public void onResponseStarted(UrlRequest request, ResponseInfo info) {
+        public void onResponseStarted(UrlRequest request, UrlResponseInfo info) {
             mResponseInfo = info;
             // Quits the message loop since we have the headers now.
             mMessageLoop.quit();
         }
 
         @Override
-        public void onReadCompleted(UrlRequest request, ResponseInfo info,
-                ByteBuffer byteBuffer) {
+        public void onReadCompleted(
+                UrlRequest request, UrlResponseInfo info, ByteBuffer byteBuffer) {
             mResponseInfo = info;
             mMessageLoop.quit();
         }
 
         @Override
-        public void onReceivedRedirect(UrlRequest request, ResponseInfo info,
-                String newLocationUrl) {
+        public void onReceivedRedirect(
+                UrlRequest request, UrlResponseInfo info, String newLocationUrl) {
             mOnRedirectCalled = true;
             if (instanceFollowRedirects) {
                 try {
                     url = new URL(newLocationUrl);
                 } catch (MalformedURLException e) {
                     // Ignored.
                 }
                 mRequest.followRedirect();
             } else {
                 mResponseInfo = info;
                 mRequest.cancel();
                 setResponseDataCompleted();
             }
         }
 
         @Override
-        public void onSucceeded(UrlRequest request, ExtendedResponseInfo info) {
-            mResponseInfo = info.getResponseInfo();
+        public void onSucceeded(UrlRequest request, UrlResponseInfo info) {
+            mResponseInfo = info;
             setResponseDataCompleted();
         }
 
         @Override
-        public void onFailed(UrlRequest request, ResponseInfo info,
-                UrlRequestException exception) {
+        public void onFailed(
+                UrlRequest request, UrlResponseInfo info, UrlRequestException exception) {
             if (exception == null) {
                 throw new IllegalStateException(
                         "Exception cannot be null in onFailed.");
             }
             mResponseInfo = info;
             mException = exception;
             setResponseDataCompleted();
         }
 
         /**
@@ skipping 40 matching lines @@
             throw mException;
         } else if (mResponseInfo == null) {
             throw new NullPointerException(
                     "Response info is null when there is no exception.");
         }
     }
 
     /**
      * Helper method to return the response header field at position pos.
      */
-    private Pair<String, String> getHeaderFieldPair(int pos) {
+    private Map.Entry<String, String> getHeaderFieldEntry(int pos) {
         try {
             getResponse();
         } catch (IOException e) {
             return null;
         }
-        List<Pair<String, String>> headers =
-                mResponseInfo.getAllHeadersAsList();
+        List<Map.Entry<String, String>> headers = mResponseInfo.getAllHeadersAsList();
         if (pos >= headers.size()) {
             return null;
         }
         return headers.get(pos);
     }
 
     /**
      * Returns whether the client has used {@link #setChunkedStreamingMode} to
      * set chunked encoding for upload.
      */
     private boolean isChunkedUpload() {
         return chunkLength > 0;
     }
 }