[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

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.UrlRequestContext;
 import org.chromium.net.UrlRequestException;
 import org.chromium.net.UrlRequestListener;
 
 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;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 /**
  * An implementation of {@link HttpURLConnection} that uses Cronet to send
  * requests and receive responses.
  */
 class CronetHttpURLConnection extends HttpURLConnection {
     private static final String TAG = "cr.CronetHttpURLConn";
     private static final String CONTENT_LENGTH = "Content-Length";
-    private final UrlRequestContext mUrlRequestContext;
+    private final CronetEngine mCronetEngine;
     private final MessageLoop mMessageLoop;
-    private final UrlRequest mRequest;
+    private UrlRequest mRequest;
     private final List<Pair<String, String>> mRequestHeaders;
 
     private CronetInputStream mInputStream;
     private CronetOutputStream mOutputStream;
     private ResponseInfo mResponseInfo;
     private UrlRequestException mException;
     private boolean mOnRedirectCalled = false;
     private boolean mHasResponse = false;
 
-    public CronetHttpURLConnection(URL url,
-            UrlRequestContext urlRequestContext) {
+    public CronetHttpURLConnection(URL url, CronetEngine cronetEngine) {
         super(url);
-        mUrlRequestContext = urlRequestContext;
+        mCronetEngine = cronetEngine;
         mMessageLoop = new MessageLoop();
-        mRequest = mUrlRequestContext.createRequest(url.toString(),
-                new CronetUrlRequestListener(), mMessageLoop);
         mInputStream = new CronetInputStream(this);
         mRequestHeaders = new ArrayList<Pair<String, String>>();
     }
 
     /**
      * Opens a connection to the resource. If the connect method is called when
      * the connection has already been opened (indicated by the connected field
      * having the value {@code true}), the call is ignored.
      */
     @Override
@@ skipping 180 matching lines @@
         return contentLength;
     }
 
     /**
      * Starts the request if {@code connected} is false.
      */
     private void startRequest() throws IOException {
         if (connected) {
             return;
         }
+        final UrlRequest.Builder requestBuilder = new UrlRequest.Builder(
+                getURL().toString(), new CronetUrlRequestListener(), mMessageLoop, mCronetEngine);
         if (doOutput) {
             if (mOutputStream != null) {
-                mRequest.setUploadDataProvider(mOutputStream.getUploadDataProvider(), mMessageLoop);
+                requestBuilder.setUploadDataProvider(
+                        mOutputStream.getUploadDataProvider(), mMessageLoop);
                 if (getRequestProperty(CONTENT_LENGTH) == null && !isChunkedUpload()) {
                     addRequestProperty(CONTENT_LENGTH,
                             Long.toString(mOutputStream.getUploadDataProvider().getLength()));
                 }
                 // Tells mOutputStream that startRequest() has been called, so
                 // the underlying implementation can prepare for reading if needed.
                 mOutputStream.setConnected();
             } else {
                 if (getRequestProperty(CONTENT_LENGTH) == null) {
                     addRequestProperty(CONTENT_LENGTH, "0");
                 }
             }
             // Default Content-Type to application/x-www-form-urlencoded
             if (getRequestProperty("Content-Type") == null) {
                 addRequestProperty("Content-Type",
                         "application/x-www-form-urlencoded");
             }
         }
         for (Pair<String, String> requestHeader : mRequestHeaders) {
-            mRequest.addHeader(requestHeader.first, requestHeader.second);
+            requestBuilder.addHeader(requestHeader.first, requestHeader.second);
         }
         if (!getUseCaches()) {
-            mRequest.disableCache();
+            requestBuilder.disableCache();
         }
         connected = true;
+        mRequest = requestBuilder.build();
         // Start the request.
         mRequest.start();
     }
 
     /**
      * Returns an input stream from the server in the case of an error such as
      * the requested file has not been found on the remote server.
      */
     @Override
     public InputStream getErrorStream() {
@@ skipping 240 matching lines @@
     }
 
     /**
      * Returns whether the client has used {@link #setChunkedStreamingMode} to
      * set chunked encoding for upload.
      */
     private boolean isChunkedUpload() {
         return chunkLength > 0;
     }
 }