[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java

 // Copyright 2015 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 org.chromium.base.test.util.Feature;
@@ skipping 27 matching lines @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mActivity = launchCronetTestApp();
         assertTrue(NativeTestServer.startNativeTestServer(getInstrumentation().getTargetContext()));
     }
 
     @Override
     protected void tearDown() throws Exception {
         NativeTestServer.shutdownNativeTestServer();
-        mActivity.mUrlRequestContext.shutdown();
+        mActivity.mCronetEngine.shutdown();
         super.tearDown();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testSimpleGet() throws Exception {
         String url = NativeTestServer.getEchoMethodURL();
         TestUrlRequestListener listener = new TestUrlRequestListener();
         listener.setAutoAdvance(false);
-        UrlRequest urlRequest =
-                mActivity.mUrlRequestContext.createRequest(url, listener, listener.getExecutor());
-        // Calling before request is started should give Status.INVALID,
-        // since the native adapter is not created.
-        TestStatusListener statusListener0 = new TestStatusListener();
-        urlRequest.getStatus(statusListener0);
-        statusListener0.waitUntilOnStatusCalled();
-        assertTrue(statusListener0.mOnStatusCalled);
-        assertEquals(Status.INVALID, statusListener0.mStatus);
-
+        UrlRequest.Builder builder = new UrlRequest.Builder(
+                url, listener, listener.getExecutor(), mActivity.mCronetEngine);
+        UrlRequest urlRequest = builder.build();
         urlRequest.start();
 
         // Should receive a valid status.
         TestStatusListener statusListener1 = new TestStatusListener();
         urlRequest.getStatus(statusListener1);
         statusListener1.waitUntilOnStatusCalled();
         assertTrue(statusListener1.mOnStatusCalled);
         assertTrue(statusListener1.mStatus >= Status.IDLE);
         assertTrue(statusListener1.mStatus <= Status.READING_RESPONSE);
 
@@ skipping 51 matching lines @@
             Status.convertLoadState(16);
             fail();
         } catch (AssertionError e) {
             // Expected.
         } catch (IllegalArgumentException e) {
             // If assertions are disabled, an IllegalArgumentException should be thrown.
             assertEquals("No request status found.", e.getMessage());
         }
     }
 }