[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java
index 8291ce0c4e379e121910640c961bf87ae7ffa92a..a4d9eefb34b4ce9eabc3d495ab767c1531234c68 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java
@@ -45,7 +45,7 @@ public class GetStatusTest extends CronetTestBase {
     @Override
     protected void tearDown() throws Exception {
         NativeTestServer.shutdownNativeTestServer();
-        mActivity.mUrlRequestContext.shutdown();
+        mActivity.mCronetEngine.shutdown();
         super.tearDown();
     }
 
@@ -55,16 +55,9 @@ public class GetStatusTest extends CronetTestBase {
         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.