[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet/android/test/javatests/src/org/chromium/net/ContextInitTest.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.content.ContextWrapper;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
@@ skipping 120 matching lines @@
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitDifferentContexts() throws Exception {
         // Test that concurrently instantiating ChromiumUrlRequestContext's upon
         // various different versions of the same Android Context does not cause
         // crashes like crbug.com/453845
         final CronetTestActivity activity = launchCronetTestApp();
         HttpUrlRequestFactory firstFactory =
-                HttpUrlRequestFactory.createFactory(activity, activity.getContextConfig());
+                HttpUrlRequestFactory.createFactory(activity.createCronetEngineBuilder(activity));
         HttpUrlRequestFactory secondFactory = HttpUrlRequestFactory.createFactory(
-                activity.getApplicationContext(), activity.getContextConfig());
+                activity.createCronetEngineBuilder(activity.getApplicationContext()));
         HttpUrlRequestFactory thirdFactory = HttpUrlRequestFactory.createFactory(
-                new ContextWrapper(activity), activity.getContextConfig());
+                activity.createCronetEngineBuilder(new ContextWrapper(activity)));
         // Meager attempt to extend lifetimes to ensure they're concurrently
         // alive.
         firstFactory.getName();
         secondFactory.getName();
         thirdFactory.getName();
     }
 }