[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.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.os.ConditionVariable;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 
@@ skipping 26 matching lines @@
         mActivity = launchCronetTestApp();
         assertTrue(NativeTestServer.startNativeTestServer(
                 getInstrumentation().getTargetContext()));
         // Add url interceptors after native application context is initialized.
         MockUrlRequestJobFactory.setUp();
     }
 
     @Override
     protected void tearDown() throws Exception {
         NativeTestServer.shutdownNativeTestServer();
-        mActivity.mUrlRequestContext.shutdown();
+        mActivity.mCronetEngine.shutdown();
         super.tearDown();
     }
 
     private TestUrlRequestListener startAndWaitForComplete(String url)
             throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         // Create request.
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                url, listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(
+                url, listener, listener.getExecutor(), mActivity.mCronetEngine);
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
         listener.blockForDone();
         assertTrue(urlRequest.isDone());
         return listener;
     }
 
     private void checkResponseInfo(ResponseInfo responseInfo,
             String expectedUrl, int expectedHttpStatusCode,
             String expectedHttpStatusText) {
         assertEquals(expectedUrl, responseInfo.getUrl());
         assertEquals(expectedUrl, responseInfo.getUrlChain()[
                 responseInfo.getUrlChain().length - 1]);
         assertEquals(expectedHttpStatusCode, responseInfo.getHttpStatusCode());
         assertEquals(expectedHttpStatusText, responseInfo.getHttpStatusText());
         assertFalse(responseInfo.wasCached());
     }
 
     private void checkResponseInfoHeader(ResponseInfo responseInfo,
             String headerName, String headerValue) {
         Map<String, List<String>> responseHeaders =
                 responseInfo.getAllHeaders();
         List<String> header = responseHeaders.get(headerName);
         assertNotNull(header);
         assertTrue(header.contains(headerValue));
     }
 
     @SmallTest
     @Feature({"Cronet"})
+    public void testBuilderChecks() throws Exception {
+        TestUrlRequestListener listener = new TestUrlRequestListener();
+        try {
+            new UrlRequest.Builder(null, listener, listener.getExecutor(), mActivity.mCronetEngine);
+            fail("URL not null-checked");
+        } catch (NullPointerException e) {
+            assertEquals("URL is required.", e.getMessage());
+        }
+        try {
+            new UrlRequest.Builder(NativeTestServer.getRedirectURL(), null, listener.getExecutor(),
+                    mActivity.mCronetEngine);
+            fail("Listener not null-checked");
+        } catch (NullPointerException e) {
+            assertEquals("Listener is required.", e.getMessage());
+        }
+        try {
+            new UrlRequest.Builder(
+                    NativeTestServer.getRedirectURL(), listener, null, mActivity.mCronetEngine);
+            fail("Executor not null-checked");
+        } catch (NullPointerException e) {
+            assertEquals("Executor is required.", e.getMessage());
+        }
+        try {
+            new UrlRequest.Builder(
+                    NativeTestServer.getRedirectURL(), listener, listener.getExecutor(), null);
+            fail("CronetEngine not null-checked");
+        } catch (NullPointerException e) {
+            assertEquals("CronetEngine is required.", e.getMessage());
+        }
+        // Verify successful creation doesn't throw.
+        new UrlRequest.Builder(NativeTestServer.getRedirectURL(), listener, listener.getExecutor(),
+                mActivity.mCronetEngine);
+    }
+
+    @SmallTest
+    @Feature({"Cronet"})
     public void testSimpleGet() throws Exception {
         TestUrlRequestListener listener = startAndWaitForComplete(
                 NativeTestServer.getEchoMethodURL());
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         // Default method is 'GET'.
         assertEquals("GET", listener.mResponseAsString);
         assertEquals(0, listener.mRedirectCount);
         assertEquals(listener.mResponseStep, ResponseStep.ON_SUCCEEDED);
         checkResponseInfo(listener.mResponseInfo,
                 NativeTestServer.getEchoMethodURL(), 200, "OK");
         checkResponseInfo(listener.mExtendedResponseInfo.getResponseInfo(),
                 NativeTestServer.getEchoMethodURL(), 200, "OK");
     }
 
     /**
      * Tests a redirect by running it step-by-step. Also tests that delaying a
      * request works as expected. To make sure there are no unexpected pending
      * messages, does a GET between UrlRequestListener callbacks.
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testRedirectAsync() throws Exception {
         // Start the request and wait to see the redirect.
         TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.setAutoAdvance(false);
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getRedirectURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
         listener.waitForNextStep();
 
         // Check the redirect.
         assertEquals(ResponseStep.ON_RECEIVED_REDIRECT, listener.mResponseStep);
         assertEquals(1, listener.mRedirectResponseInfoList.size());
         checkResponseInfo(listener.mRedirectResponseInfoList.get(0),
                 NativeTestServer.getRedirectURL(), 302, "Found");
         assertEquals(1,
                 listener.mRedirectResponseInfoList.get(0).getUrlChain().length);
@@ skipping 88 matching lines @@
         // onFailed messages. This test relies on checks in
         // TestUrlRequestListener catching a second onFailed call.
         testSimpleGet();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testSetHttpMethod() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         String methodName = "HEAD";
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoMethodURL(), listener,
-                listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
         // Try to set 'null' method.
         try {
-            urlRequest.setHttpMethod(null);
+            builder.setHttpMethod(null);
             fail("Exception not thrown");
         } catch (NullPointerException e) {
             assertEquals("Method is required.", e.getMessage());
         }
 
-        urlRequest.setHttpMethod(methodName);
-        urlRequest.start();
-        try {
-            urlRequest.setHttpMethod("toolate");
-            fail("Exception not thrown");
-        } catch (IllegalStateException e) {
-            assertEquals("Request is already started.", e.getMessage());
-        }
+        builder.setHttpMethod(methodName);
+        builder.build().start();
         listener.blockForDone();
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals(0, listener.mHttpResponseDataLength);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testBadMethod() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                TEST_URL, listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(
+                TEST_URL, listener, listener.getExecutor(), mActivity.mCronetEngine);
         try {
-            urlRequest.setHttpMethod("bad:method!");
-            urlRequest.start();
+            builder.setHttpMethod("bad:method!");
+            builder.build().start();
             fail("IllegalArgumentException not thrown.");
         } catch (IllegalArgumentException e) {
             assertEquals("Invalid http method bad:method!",
                     e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testBadHeaderName() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                TEST_URL, listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(
+                TEST_URL, listener, listener.getExecutor(), mActivity.mCronetEngine);
         try {
-            urlRequest.addHeader("header:name", "headervalue");
-            urlRequest.start();
+            builder.addHeader("header:name", "headervalue");
+            builder.build().start();
             fail("IllegalArgumentException not thrown.");
         } catch (IllegalArgumentException e) {
             assertEquals("Invalid header header:name=headervalue",
                     e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testBadHeaderValue() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                TEST_URL, listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(
+                TEST_URL, listener, listener.getExecutor(), mActivity.mCronetEngine);
         try {
-            urlRequest.addHeader("headername", "bad header\r\nvalue");
-            urlRequest.start();
+            builder.addHeader("headername", "bad header\r\nvalue");
+            builder.build().start();
             fail("IllegalArgumentException not thrown.");
         } catch (IllegalArgumentException e) {
             assertEquals("Invalid header headername=bad header\r\nvalue",
                     e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testAddHeader() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         String headerName = "header-name";
         String headerValue = "header-value";
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoHeaderURL(headerName), listener,
-                listener.getExecutor());
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getEchoHeaderURL(headerName), listener,
+                        listener.getExecutor(), mActivity.mCronetEngine);
 
-        urlRequest.addHeader(headerName, headerValue);
-        urlRequest.start();
-        try {
-            urlRequest.addHeader("header2", "value");
-            fail("Exception not thrown");
-        } catch (IllegalStateException e) {
-            assertEquals("Request is already started.", e.getMessage());
-        }
+        builder.addHeader(headerName, headerValue);
+        builder.build().start();
         listener.blockForDone();
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals(headerValue, listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testMultiRequestHeaders() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         String headerName = "header-name";
         String headerValue1 = "header-value1";
         String headerValue2 = "header-value2";
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoAllHeadersURL(), listener,
-                listener.getExecutor());
-        urlRequest.addHeader(headerName, headerValue1);
-        urlRequest.addHeader(headerName, headerValue2);
-        urlRequest.start();
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoAllHeadersURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
+        builder.addHeader(headerName, headerValue1);
+        builder.addHeader(headerName, headerValue2);
+        builder.build().start();
         listener.blockForDone();
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         String headers = listener.mResponseAsString;
         Pattern pattern = Pattern.compile(headerName + ":\\s(.*)\\r\\n");
         Matcher matcher = pattern.matcher(headers);
         List<String> actualValues = new ArrayList<String>();
         while (matcher.find()) {
             actualValues.add(matcher.group(1));
         }
         assertEquals(1, actualValues.size());
         assertEquals("header-value2", actualValues.get(0));
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testCustomUserAgent() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         String userAgentName = "User-Agent";
         String userAgentValue = "User-Agent-Value";
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoHeaderURL(userAgentName), listener,
-                listener.getExecutor());
-        urlRequest.addHeader(userAgentName, userAgentValue);
-        urlRequest.start();
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getEchoHeaderURL(userAgentName), listener,
+                        listener.getExecutor(), mActivity.mCronetEngine);
+        builder.addHeader(userAgentName, userAgentValue);
+        builder.build().start();
         listener.blockForDone();
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals(userAgentValue, listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testDefaultUserAgent() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         String headerName = "User-Agent";
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoHeaderURL(headerName), listener,
-                listener.getExecutor());
-        urlRequest.start();
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getEchoHeaderURL(headerName), listener,
+                        listener.getExecutor(), mActivity.mCronetEngine);
+        builder.build().start();
         listener.blockForDone();
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertTrue("Default User-Agent should contain Cronet/n.n.n.n but is "
                            + listener.mResponseAsString,
                    Pattern.matches(".+Cronet/\\d+\\.\\d+\\.\\d+\\.\\d+.+",
                            listener.mResponseAsString));
     }
 
     @SmallTest
     @Feature({"Cronet"})
@@ skipping 157 matching lines @@
      * when using legacy read() API.
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testLegacySimpleGetBufferUpdates() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.mLegacyReadByteBufferAdjustment = true;
         listener.setAutoAdvance(false);
         // Since the default method is "GET", the expected response body is also
         // "GET".
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoMethodURL(),
-                listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
         listener.waitForNextStep();
 
         ByteBuffer readBuffer = ByteBuffer.allocateDirect(5);
         readBuffer.put("FOR".getBytes());
         assertEquals(3, readBuffer.position());
 
         // Read first two characters of the response ("GE"). It's theoretically
         // possible to need one read per character, though in practice,
         // shouldn't happen.
@@ skipping 64 matching lines @@
     /**
      * Checks that the buffer is updated correctly, when starting at an offset.
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testSimpleGetBufferUpdates() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.setAutoAdvance(false);
         // Since the default method is "GET", the expected response body is also
         // "GET".
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
         listener.waitForNextStep();
 
         ByteBuffer readBuffer = ByteBuffer.allocateDirect(5);
         readBuffer.put("FOR".getBytes());
         assertEquals(3, readBuffer.position());
 
         // Read first two characters of the response ("GE"). It's theoretically
         // possible to need one read per character, though in practice,
         // shouldn't happen.
@@ skipping 59 matching lines @@
         // Make sure there are no other pending messages, which would trigger
         // asserts in TestURLRequestListener.
         testSimpleGet();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testBadBuffers() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.setAutoAdvance(false);
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoMethodURL(), listener,
-                listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
         listener.waitForNextStep();
 
         // Try to read using a full buffer.
         try {
             ByteBuffer readBuffer = ByteBuffer.allocateDirect(4);
             readBuffer.put("full".getBytes());
             urlRequest.readNew(readBuffer);
             fail("Exception not thrown");
         } catch (IllegalArgumentException e) {
@@ skipping 18 matching lines @@
         listener.blockForDone();
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("GET", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUnexpectedReads() throws Exception {
         final TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.setAutoAdvance(false);
-        final UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
+        final UrlRequest urlRequest =
+                new UrlRequest.Builder(NativeTestServer.getRedirectURL(), listener,
+                                      listener.getExecutor(), mActivity.mCronetEngine)
+                        .build();
 
         // Try to read before starting request.
         try {
             listener.startNextRead(urlRequest);
             fail("Exception not thrown");
         } catch (IllegalStateException e) {
             assertEquals("Unexpected read attempt.",
                     e.getMessage());
         }
 
@@ skipping 61 matching lines @@
             assertEquals("Unexpected read attempt.",
                     e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUnexpectedFollowRedirects() throws Exception {
         final TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.setAutoAdvance(false);
-        final UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
+        final UrlRequest urlRequest =
+                new UrlRequest.Builder(NativeTestServer.getRedirectURL(), listener,
+                                      listener.getExecutor(), mActivity.mCronetEngine)
+                        .build();
 
         // Try to follow a redirect before starting the request.
         try {
             urlRequest.followRedirect();
             fail("Exception not thrown");
         } catch (IllegalStateException e) {
             assertEquals("No redirect to follow.",
                     e.getMessage());
         }
 
@@ skipping 58 matching lines @@
         } catch (IllegalStateException e) {
             assertEquals("No redirect to follow.",
                     e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadSetDataProvider() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         try {
-            urlRequest.setUploadDataProvider(null, listener.getExecutor());
+            builder.setUploadDataProvider(null, listener.getExecutor());
             fail("Exception not thrown");
         } catch (NullPointerException e) {
             assertEquals("Invalid UploadDataProvider.", e.getMessage());
         }
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
         try {
-            urlRequest.start();
+            builder.build().start();
             fail("Exception not thrown");
         } catch (IllegalArgumentException e) {
             assertEquals("Requests with upload data must have a Content-Type.", e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadEmptyBodySync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(0, dataProvider.getLength());
         assertEquals(0, dataProvider.getNumReadCalls());
         assertEquals(0, dataProvider.getNumRewindCalls());
 
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadSync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(4, dataProvider.getLength());
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals(0, dataProvider.getNumRewindCalls());
 
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("test", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadMultiplePiecesSync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.addRead("Y".getBytes());
         dataProvider.addRead("et ".getBytes());
         dataProvider.addRead("another ".getBytes());
         dataProvider.addRead("test".getBytes());
 
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(16, dataProvider.getLength());
         assertEquals(4, dataProvider.getNumReadCalls());
         assertEquals(0, dataProvider.getNumRewindCalls());
 
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("Yet another test", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadMultiplePiecesAsync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.ASYNC, listener.getExecutor());
         dataProvider.addRead("Y".getBytes());
         dataProvider.addRead("et ".getBytes());
         dataProvider.addRead("another ".getBytes());
         dataProvider.addRead("test".getBytes());
 
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(16, dataProvider.getLength());
         assertEquals(4, dataProvider.getNumReadCalls());
         assertEquals(0, dataProvider.getNumRewindCalls());
 
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("Yet another test", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadChangesDefaultMethod() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("POST", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadWithSetMethod() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         final String method = "PUT";
-        urlRequest.setHttpMethod(method);
+        builder.setHttpMethod(method);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("PUT", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadRedirectSync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), listener,
+                        listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         // 1 read call before the rewind, 1 after.
         assertEquals(2, dataProvider.getNumReadCalls());
         assertEquals(1, dataProvider.getNumRewindCalls());
 
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("test", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadRedirectAsync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), listener,
+                        listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.ASYNC, listener.getExecutor());
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         // 1 read call before the rewind, 1 after.
         assertEquals(2, dataProvider.getNumReadCalls());
         assertEquals(1, dataProvider.getNumRewindCalls());
 
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("test", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadReadFailSync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.setReadFailure(0, TestUploadDataProvider.FailMode.CALLBACK_SYNC);
         // This will never be read, but if the length is 0, read may never be
         // called.
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals(0, dataProvider.getNumRewindCalls());
 
         assertEquals("Exception received from UploadDataProvider", listener.mError.getMessage());
         assertEquals("Sync read failure", listener.mError.getCause().getMessage());
         assertEquals(null, listener.mResponseInfo);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadReadFailAsync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.setReadFailure(0, TestUploadDataProvider.FailMode.CALLBACK_ASYNC);
         // This will never be read, but if the length is 0, read may never be
         // called.
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals(0, dataProvider.getNumRewindCalls());
 
         assertEquals("Exception received from UploadDataProvider", listener.mError.getMessage());
         assertEquals("Async read failure", listener.mError.getCause().getMessage());
         assertEquals(null, listener.mResponseInfo);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadReadFailThrown() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.setReadFailure(0, TestUploadDataProvider.FailMode.THROWN);
         // This will never be read, but if the length is 0, read may never be
         // called.
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals(0, dataProvider.getNumRewindCalls());
 
         assertEquals("Exception received from UploadDataProvider", listener.mError.getMessage());
         assertEquals("Thrown read failure", listener.mError.getCause().getMessage());
         assertEquals(null, listener.mResponseInfo);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadRewindFailSync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), listener,
+                        listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.setRewindFailure(TestUploadDataProvider.FailMode.CALLBACK_SYNC);
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals(1, dataProvider.getNumRewindCalls());
 
         assertEquals("Exception received from UploadDataProvider", listener.mError.getMessage());
         assertEquals("Sync rewind failure", listener.mError.getCause().getMessage());
         assertEquals(null, listener.mResponseInfo);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadRewindFailAsync() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), listener,
+                        listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.ASYNC, listener.getExecutor());
         dataProvider.setRewindFailure(TestUploadDataProvider.FailMode.CALLBACK_ASYNC);
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals(1, dataProvider.getNumRewindCalls());
 
         assertEquals("Exception received from UploadDataProvider", listener.mError.getMessage());
         assertEquals("Async rewind failure", listener.mError.getCause().getMessage());
         assertEquals(null, listener.mResponseInfo);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadRewindFailThrown() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
+        UrlRequest.Builder builder =
+                new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), listener,
+                        listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.setRewindFailure(TestUploadDataProvider.FailMode.THROWN);
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals(1, dataProvider.getNumRewindCalls());
 
         assertEquals("Exception received from UploadDataProvider", listener.mError.getMessage());
         assertEquals("Thrown rewind failure", listener.mError.getCause().getMessage());
         assertEquals(null, listener.mResponseInfo);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadChunked() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.addRead("test hello".getBytes());
         dataProvider.setChunked(true);
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
 
         assertEquals(-1, dataProvider.getLength());
 
-        urlRequest.start();
+        builder.build().start();
         listener.blockForDone();
 
         // 1 read call for one data chunk.
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals("test hello", listener.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadChunkedLastReadZeroLengthBody() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         // Add 3 reads. The last read has a 0-length body.
         dataProvider.addRead("hello there".getBytes());
         dataProvider.addRead("!".getBytes());
         dataProvider.addRead("".getBytes());
         dataProvider.setChunked(true);
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
 
         assertEquals(-1, dataProvider.getLength());
 
-        urlRequest.start();
+        builder.build().start();
         listener.blockForDone();
 
         // 2 read call for the first two data chunks, and 1 for final chunk.
         assertEquals(3, dataProvider.getNumReadCalls());
         assertEquals("hello there!", listener.mResponseAsString);
     }
 
     // Test where an upload fails without ever initializing the
     // UploadDataStream, because it can't connect to the server.
     @SmallTest
     @Feature({"Cronet"})
     public void testUploadFailsWithoutInitializingStream() throws Exception {
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
         // Shut down the test server, so connecting to it fails. Note that
         // calling shutdown again during teardown is safe.
         NativeTestServer.shutdownNativeTestServer();
 
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
         dataProvider.addRead("test".getBytes());
-        urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
-        urlRequest.addHeader("Content-Type", "useless/string");
-        urlRequest.start();
+        builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+        builder.addHeader("Content-Type", "useless/string");
+        builder.build().start();
         listener.blockForDone();
 
         assertNull(listener.mResponseInfo);
         assertEquals("Exception in CronetUrlRequest: net::ERR_CONNECTION_REFUSED",
                 listener.mError.getMessage());
     }
 
     private void throwOrCancel(FailureType failureType, ResponseStep failureStep,
             boolean expectResponseInfo, boolean expectError) {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.setFailure(failureType, failureStep);
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getRedirectURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
         listener.blockForDone();
         assertEquals(1, listener.mRedirectCount);
         assertEquals(listener.mResponseStep, failureStep);
         assertTrue(urlRequest.isDone());
         assertEquals(expectResponseInfo, listener.mResponseInfo != null);
         assertEquals(expectError, listener.mError != null);
         assertEquals(expectError, listener.mOnErrorCalled);
     }
 
@@ skipping 26 matching lines @@
                 true, false);
         throwOrCancel(FailureType.THROW_SYNC, ResponseStep.ON_READ_COMPLETED,
                 true, true);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testThrowON_SUCCEEDED() {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.setFailure(FailureType.THROW_SYNC, ResponseStep.ON_SUCCEEDED);
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getRedirectURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
         listener.blockForDone();
         assertEquals(1, listener.mRedirectCount);
         assertEquals(listener.mResponseStep, ResponseStep.ON_SUCCEEDED);
         assertTrue(urlRequest.isDone());
         assertNotNull(listener.mResponseInfo);
         assertNull(listener.mError);
         assertFalse(listener.mOnErrorCalled);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testExecutorShutdown() {
         TestUrlRequestListener listener = new TestUrlRequestListener();
 
         listener.setAutoAdvance(false);
-        CronetUrlRequest urlRequest =
-                (CronetUrlRequest) mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
+        CronetUrlRequest urlRequest = (CronetUrlRequest) builder.build();
         urlRequest.start();
         listener.waitForNextStep();
         assertFalse(listener.isDone());
         assertFalse(urlRequest.isDone());
 
         final ConditionVariable requestDestroyed = new ConditionVariable(false);
         urlRequest.setOnDestroyedCallbackForTests(new Runnable() {
             @Override
             public void run() {
                 requestDestroyed.open();
@@ skipping 32 matching lines @@
                 mByteBuffer = byteBuffer;
                 mReadCalled.open();
             }
 
             @Override
             public void rewind(final UploadDataSink uploadDataSink) {
             }
         }
 
         TestUrlRequestListener listener = new TestUrlRequestListener();
-        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
+        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
+                listener, listener.getExecutor(), mActivity.mCronetEngine);
 
         ExecutorService uploadExecutor = Executors.newSingleThreadExecutor();
         HangingUploadDataProvider dataProvider = new HangingUploadDataProvider();
-        urlRequest.setUploadDataProvider(dataProvider, uploadExecutor);
-        urlRequest.addHeader("Content-Type", "useless/string");
+        builder.setUploadDataProvider(dataProvider, uploadExecutor);
+        builder.addHeader("Content-Type", "useless/string");
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
         // Wait for read to be called on executor.
         dataProvider.mReadCalled.block();
         // Shutdown the executor, so posting next task will throw an exception.
         uploadExecutor.shutdown();
         // Continue the upload.
         dataProvider.mByteBuffer.putInt(42);
         dataProvider.mUploadDataSink.onReadSucceeded(false);
         // Listener.onFailed will be called on request executor even though upload
         // executor is shutdown.
@@ skipping 10 matching lines @@
             int end) {
         // Use a duplicate to avoid modifying byteBuffer.
         ByteBuffer duplicate = byteBuffer.duplicate();
         duplicate.position(start);
         duplicate.limit(end);
         byte[] contents = new byte[duplicate.remaining()];
         duplicate.get(contents);
         return new String(contents);
     }
 }