[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..d5df687d73a3bf32b2fc082a02aad5c6d6471d3c 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
@@ -4,10 +4,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 +39,19 @@ 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.
      * @throws NullPointerException if config is null.
      */
-    public CronetURLStreamHandlerFactory(Context context,
-            UrlRequestContextConfig config) {
-        if (config == null) {
-            throw new NullPointerException("UrlRequestContextConfig is null.");
+    public CronetURLStreamHandlerFactory(CronetEngine.Builder builder) {

[xunjieli, 2015/10/01 19:00:09]

I think the client should be the one who call CronetEngine.Build(). Can we make
this constructor take in an Engine instead?

[pauljensen, 2015/10/01 23:42:59]

Done.

+        if (builder == null) {
+            throw new NullPointerException("CronetEngine.Builder is null.");
         }
-        mRequestContext = UrlRequestContext.createContext(context, config);
+        mCronetEngine = builder.build();
     }
 
     /**
@@ -66,7 +61,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;
     }