[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet/android/java/src/org/chromium/net/HttpUrlRequestFactory.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.Context;
 import android.util.Log;
 
 import java.lang.reflect.Constructor;
 import java.nio.channels.WritableByteChannel;
 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 {
     private static final String TAG = "HttpUrlRequestFactory";
 
     private static final String CHROMIUM_URL_REQUEST_FACTORY =
             "org.chromium.net.ChromiumUrlRequestFactory";
 
     public static HttpUrlRequestFactory createFactory(
-            Context context, UrlRequestContextConfig config) {
+            Context context, CronetEngine.Builder builder) {
         HttpUrlRequestFactory factory = null;
-        if (!config.legacyMode()) {
-            factory = createChromiumFactory(context, config);
+        if (!builder.legacyMode()) {
+            factory = createChromiumFactory(context, builder);
         }
         if (factory == null) {
             // Default to HttpUrlConnection-based networking.
-            factory = new HttpUrlConnectionUrlRequestFactory(context, config);
+            factory = new HttpUrlConnectionUrlRequestFactory(context, builder);
         }
         Log.i(TAG, "Using network stack: " + factory.getName());
         return factory;
     }
 
     /**
      * Returns true if the factory is enabled.
      */
     public abstract boolean isEnabled();
 
@@ skipping 28 matching lines @@
      */
     public abstract void startNetLogToFile(String fileName, boolean logAll);
 
     /**
      * Stops NetLog logging and flushes file to disk. If a logging session is
      * not in progress this call is ignored.
      */
     public abstract void stopNetLog();
 
     private static HttpUrlRequestFactory createChromiumFactory(
-            Context context, UrlRequestContextConfig config) {
+            Context context, CronetEngine.Builder builder) {
         HttpUrlRequestFactory factory = null;
         try {
             Class<? extends HttpUrlRequestFactory> factoryClass =
                     HttpUrlRequestFactory.class.getClassLoader()
                             .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(Context.class, CronetEngine.Builder.class);
+            HttpUrlRequestFactory chromiumFactory = constructor.newInstance(context, builder);
             if (chromiumFactory.isEnabled()) {
                 factory = chromiumFactory;
             }
         } catch (ClassNotFoundException e) {
             // Leave as null
         } catch (Exception e) {
             throw new IllegalStateException(
                     "Cannot instantiate: " + CHROMIUM_URL_REQUEST_FACTORY,
                     e);
         }
         return factory;
     }
 }