[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet/android/java/src/org/chromium/net/HttpUrlRequestFactory.java

Index: components/cronet/android/java/src/org/chromium/net/HttpUrlRequestFactory.java
diff --git a/components/cronet/android/java/src/org/chromium/net/HttpUrlRequestFactory.java b/components/cronet/android/java/src/org/chromium/net/HttpUrlRequestFactory.java
index fe84f5fae897ac33259b5478962f3bb3944317c0..38d91024d853f1aabc2f66ff44f19129b3899f02 100644
--- a/components/cronet/android/java/src/org/chromium/net/HttpUrlRequestFactory.java
+++ b/components/cronet/android/java/src/org/chromium/net/HttpUrlRequestFactory.java
@@ -4,7 +4,6 @@
 
 package org.chromium.net;
 
-import android.content.Context;
 import android.util.Log;
 
 import java.lang.reflect.Constructor;
@@ -14,7 +13,7 @@ import java.util.Map;
 /**
  * A factory for {@link HttpUrlRequest}'s, which uses the best HTTP stack
  * available on the current platform.
- * @deprecated Use {@link UrlRequestContext} instead.
+ * @deprecated Use {@link CronetEngine} instead.
  */
 @Deprecated
 public abstract class HttpUrlRequestFactory {
@@ -23,15 +22,14 @@ public abstract class HttpUrlRequestFactory {
     private static final String CHROMIUM_URL_REQUEST_FACTORY =
             "org.chromium.net.ChromiumUrlRequestFactory";
 
-    public static HttpUrlRequestFactory createFactory(
-            Context context, UrlRequestContextConfig config) {
+    public static HttpUrlRequestFactory createFactory(CronetEngine.Builder builder) {
         HttpUrlRequestFactory factory = null;
-        if (!config.legacyMode()) {
-            factory = createChromiumFactory(context, config);
+        if (!builder.legacyMode()) {
+            factory = createChromiumFactory(builder);
         }
         if (factory == null) {
             // Default to HttpUrlConnection-based networking.
-            factory = new HttpUrlConnectionUrlRequestFactory(context, config);
+            factory = new HttpUrlConnectionUrlRequestFactory(builder);
         }
         Log.i(TAG, "Using network stack: " + factory.getName());
         return factory;
@@ -79,8 +77,7 @@ public abstract class HttpUrlRequestFactory {
      */
     public abstract void stopNetLog();
 
-    private static HttpUrlRequestFactory createChromiumFactory(
-            Context context, UrlRequestContextConfig config) {
+    private static HttpUrlRequestFactory createChromiumFactory(CronetEngine.Builder builder) {
         HttpUrlRequestFactory factory = null;
         try {
             Class<? extends HttpUrlRequestFactory> factoryClass =
@@ -88,10 +85,8 @@ public abstract class HttpUrlRequestFactory {
                             .loadClass(CHROMIUM_URL_REQUEST_FACTORY)
                             .asSubclass(HttpUrlRequestFactory.class);
             Constructor<? extends HttpUrlRequestFactory> constructor =
-                    factoryClass.getConstructor(
-                            Context.class, UrlRequestContextConfig.class);
-            HttpUrlRequestFactory chromiumFactory =
-                    constructor.newInstance(context, config);
+                    factoryClass.getConstructor(CronetEngine.Builder.class);
+            HttpUrlRequestFactory chromiumFactory = constructor.newInstance(builder);
             if (chromiumFactory.isEnabled()) {
                 factory = chromiumFactory;
             }