[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java

Index: components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java
diff --git a/components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java b/components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java
index 2363a8f9ddde822f3d08f16d1076b6660432ac74..2a3538542381625a00322f64bc73963bb1cf8722 100644
--- a/components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java
+++ b/components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java
@@ -6,8 +6,7 @@ package org.chromium.net.urlconnection;
 
 import android.content.Context;
 
-import org.chromium.net.UrlRequestContext;
-import org.chromium.net.UrlRequestContextConfig;
+import org.chromium.net.CronetEngine;
 
 import java.net.URLStreamHandler;
 import java.net.URLStreamHandlerFactory;
@@ -42,21 +41,20 @@ import java.net.URLStreamHandlerFactory;
  */
 public class CronetURLStreamHandlerFactory
         implements URLStreamHandlerFactory {
-    private final UrlRequestContext mRequestContext;
+    private final CronetEngine mCronetEngine;
 
     /**
      * Creates a {@link CronetURLStreamHandlerFactory} to handle HTTP and HTTPS
      * traffic.
      * @param context application context.
-     * @param config the configuration to be used.
+     * @param builder the {@link CronetEngine} builder to be used.

[mef, 2015/09/25 21:32:19]

Maybe {@link CronetEngine.Builder}?

[pauljensen, 2015/09/28 14:18:12]

Done.

      * @throws NullPointerException if config is null.
      */
-    public CronetURLStreamHandlerFactory(Context context,
-            UrlRequestContextConfig config) {
-        if (config == null) {
-            throw new NullPointerException("UrlRequestContextConfig is null.");
+    public CronetURLStreamHandlerFactory(Context context, CronetEngine.Builder builder) {
+        if (builder == null) {
+            throw new NullPointerException("CronetEngine.Builder is null.");
         }
-        mRequestContext = UrlRequestContext.createContext(context, config);
+        mCronetEngine = builder.build(context);
     }
 
     /**
@@ -66,7 +64,7 @@ public class CronetURLStreamHandlerFactory
     @Override
     public URLStreamHandler createURLStreamHandler(String protocol) {
         if ("http".equals(protocol) || "https".equals(protocol)) {
-            return new CronetHttpURLStreamHandler(mRequestContext);
+            return new CronetHttpURLStreamHandler(mCronetEngine);
         }
         return null;
     }