Cronet API Refactoring

components/cronet/android/api/src/org/chromium/net/CronetEngine.java

Index: components/cronet/android/api/src/org/chromium/net/CronetEngine.java
diff --git a/components/cronet/android/api/src/org/chromium/net/CronetEngine.java b/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
index 35c2a26c099c02adb393240324807f2fb2e659b9..373e7ab878a91b3ace1b75f4b0244dae5b082c9c 100644
--- a/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
+++ b/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
@@ -4,36 +4,19 @@
 
 package org.chromium.net;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.http.HttpResponseCache;
-import android.support.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
 
-import java.io.File;
 import java.io.IOException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Constructor;
-import java.net.IDN;
-import java.net.Proxy;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandlerFactory;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
-import java.util.regex.Pattern;
 
 import javax.net.ssl.HttpsURLConnection;
-
 /**
  * An engine to process {@link UrlRequest}s, which uses the best HTTP stack
  * available on the current platform.
@@ -45,6 +28,10 @@ public abstract class CronetEngine {
      * then {@link #build} is called to create the {@code CronetEngine}.
      */
     public static class Builder {
+        // The class name of the Cronet Engine Builder implementation.
+        private static final String CRONET_ENGINE_BUILDER_IMPL =
+                "org.chromium.net.impl.CronetEngineBuilderImpl";
+
         /**
          * A class which provides a method for loading the cronet native library. Apps needing to
          * implement custom library loading logic can inherit from this class and pass an instance
@@ -60,89 +47,27 @@ public abstract class CronetEngine {
             public abstract void loadLibrary(String libName);
         }
 
-        /**
-         * A hint that a host supports QUIC.
-         * @hide only used by internal implementation.
-         */
-        public static class QuicHint {
-            // The host.
-            public final String mHost;
-            // Port of the server that supports QUIC.
-            public final int mPort;
-            // Alternate protocol port.
-            public final int mAlternatePort;
-
-            QuicHint(String host, int port, int alternatePort) {
-                mHost = host;
-                mPort = port;
-                mAlternatePort = alternatePort;
-            }
-        }
-
-        /**
-         * A public key pin.
-         * @hide only used by internal implementation.
-         */
-        public static class Pkp {
-            // Host to pin for.
-            public final String mHost;
-            // Array of SHA-256 hashes of keys.
-            public final byte[][] mHashes;
-            // Should pin apply to subdomains?
-            public final boolean mIncludeSubdomains;
-            // When the pin expires.
-            public final Date mExpirationDate;
-
-            Pkp(String host, byte[][] hashes, boolean includeSubdomains, Date expirationDate) {
-                mHost = host;
-                mHashes = hashes;
-                mIncludeSubdomains = includeSubdomains;
-                mExpirationDate = expirationDate;
-            }
-        }
-
-        private static final Pattern INVALID_PKP_HOST_NAME = Pattern.compile("^[0-9\\.]*$");
-
-        // Private fields are simply storage of configuration for the resulting CronetEngine.
-        // See setters below for verbose descriptions.
-        private final Context mContext;
-        private final List<QuicHint> mQuicHints = new LinkedList<QuicHint>();
-        private final List<Pkp> mPkps = new LinkedList<>();
-        private boolean mPublicKeyPinningBypassForLocalTrustAnchorsEnabled;
-        private String mUserAgent;
-        private String mStoragePath;
-        private boolean mLegacyModeEnabled;
-        private LibraryLoader mLibraryLoader;
-        private String mLibraryName;
-        private boolean mQuicEnabled;
-        private boolean mHttp2Enabled;
-        private boolean mSdchEnabled;
-        private String mDataReductionProxyKey;
-        private String mDataReductionProxyPrimaryProxy;
-        private String mDataReductionProxyFallbackProxy;
-        private String mDataReductionProxySecureProxyCheckUrl;
-        private boolean mDisableCache;
-        private int mHttpCacheMode;
-        private long mHttpCacheMaxSize;
-        private String mExperimentalOptions;
-        private long mMockCertVerifier;
-        private boolean mNetworkQualityEstimatorEnabled;
-        private String mCertVerifierData;
+        // Reference to  the actual builder implementation.

[pauljensen, 2016/09/23 19:00:54]

extra spaces after "to"

[kapishnikov, 2016/09/23 21:26:39]

Done.

+        protected final ICronetEngineBuilder mBuilderDelegate;
 
         /**
          * Default config enables SPDY, disables QUIC, SDCH and HTTP cache.
          * @param context Android {@link Context} for engine to use.
          */
         public Builder(Context context) {
-            mContext = context;
-            setLibraryName("cronet");
-            enableLegacyMode(false);
-            enableQuic(false);
-            enableHttp2(true);
-            enableSdch(false);
-            enableHttpCache(HTTP_CACHE_DISABLED, 0);
-            enableNetworkQualityEstimator(false);
-            enablePublicKeyPinningBypassForLocalTrustAnchors(true);
+            try {
+                Class<? extends ICronetEngineBuilder> delegateImplClass =
+                        Class.forName(CRONET_ENGINE_BUILDER_IMPL)
+                                .asSubclass(ICronetEngineBuilder.class);
+                Constructor<? extends ICronetEngineBuilder> ctor =
+                        delegateImplClass.getConstructor(Context.class);
+                mBuilderDelegate = ctor.newInstance(context);
+            } catch (Exception e) {
+                throw new RuntimeException(
+                        "Unable to construct the implementation of the Cronet Engine Builder: "
+                                + CRONET_ENGINE_BUILDER_IMPL,
+                        e);
+            }
         }
 
         /**
@@ -152,7 +77,7 @@ public abstract class CronetEngine {
          * @return User-Agent string.
          */
         public String getDefaultUserAgent() {
-            return UserAgent.from(mContext);
+            return mBuilderDelegate.getDefaultUserAgent();
         }
 
         /**
@@ -165,18 +90,11 @@ public abstract class CronetEngine {
          * @return the builder to facilitate chaining.
          */
         public Builder setUserAgent(String userAgent) {
-            mUserAgent = userAgent;
+            mBuilderDelegate.setUserAgent(userAgent);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public String getUserAgent() {
-            return mUserAgent;
-        }
-
-        /**
          * Sets directory for HTTP Cache and Cookie Storage. The directory must
          * exist.
          * <p>
@@ -188,89 +106,22 @@ public abstract class CronetEngine {
          * @return the builder to facilitate chaining.
          */
         public Builder setStoragePath(String value) {
-            if (!new File(value).isDirectory()) {
-                throw new IllegalArgumentException(
-                        "Storage path must be set to existing directory");
-            }
-            mStoragePath = value;
+            mBuilderDelegate.setStoragePath(value);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public String storagePath() {
-            return mStoragePath;
-        }
-
-        /**
-         * Sets whether the resulting {@link CronetEngine} uses an
-         * implementation based on the system's
-         * {@link java.net.HttpURLConnection} implementation, or if this is
-         * only done as a backup if the native implementation fails to load.
-         * Defaults to disabled.
-         * @param value {@code true} makes the resulting {@link CronetEngine}
-         *              use an implementation based on the system's
-         *              {@link java.net.HttpURLConnection} implementation
-         *              without trying to load the native implementation.
-         *              {@code false} makes the resulting {@code CronetEngine}
-         *              use the native implementation, or if that fails to load,
-         *              falls back to an implementation based on the system's
-         *              {@link java.net.HttpURLConnection} implementation.
-         * @return the builder to facilitate chaining.
-         * @deprecated Not supported by the new API.
-         * @hide
-         */
-        @Deprecated
-        public Builder enableLegacyMode(boolean value) {
-            mLegacyModeEnabled = value;
-            return this;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public boolean legacyMode() {
-            return mLegacyModeEnabled;
-        }
-
-        /**
-         * Overrides the name of the native library backing Cronet.
-         * @param libName the name of the native library backing Cronet.
-         * @return the builder to facilitate chaining.
-         * @hide only used by internal implementation.
-         */
-        public Builder setLibraryName(String libName) {
-            mLibraryName = libName;
-            return this;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public String libraryName() {
-            return mLibraryName;
-        }
-
-        /**
          * Sets a {@link LibraryLoader} to be used to load the native library.
          * If not set, the library will be loaded using {@link System#loadLibrary}.
          * @param loader {@code LibraryLoader} to be used to load the native library.
          * @return the builder to facilitate chaining.
          */
         public Builder setLibraryLoader(LibraryLoader loader) {
-            mLibraryLoader = loader;
+            mBuilderDelegate.setLibraryLoader(loader);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public LibraryLoader libraryLoader() {
-            return mLibraryLoader;
-        }
-
-        /**
          * Sets whether <a href="https://www.chromium.org/quic">QUIC</a> protocol
          * is enabled. Defaults to disabled. If QUIC is enabled, then QUIC User Agent Id
          * containing application name and Cronet version is sent to the server.
@@ -278,49 +129,22 @@ public abstract class CronetEngine {
          * @return the builder to facilitate chaining.
          */
         public Builder enableQuic(boolean value) {
-            mQuicEnabled = value;
+            mBuilderDelegate.enableQuic(value);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public boolean quicEnabled() {
-            return mQuicEnabled;
-        }
-
-        /**
-         * Constructs default QUIC User Agent Id string including application name
-         * and Cronet version. Returns empty string if QUIC is not enabled.
-         *
-         * @param context Android {@link Context} to get package name from.
-         * @return QUIC User Agent ID string.
-         * @hide only used by internal implementation.
-         */
-        // TODO(mef): remove |context| parameter when legacy ChromiumUrlRequestContext is removed.
-        public String getDefaultQuicUserAgentId(Context context) {
-            return mQuicEnabled ? UserAgent.getQuicUserAgentIdFrom(context) : "";
-        }
-
-        /**
          * Sets whether <a href="https://tools.ietf.org/html/rfc7540">HTTP/2</a>
          * protocol is enabled. Defaults to enabled.
          * @param value {@code true} to enable HTTP/2, {@code false} to disable.
          * @return the builder to facilitate chaining.
          */
         public Builder enableHttp2(boolean value) {
-            mHttp2Enabled = value;
+            mBuilderDelegate.enableHttp2(value);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public boolean http2Enabled() {
-            return mHttp2Enabled;
-        }
-
-        /**
          * Sets whether
          * <a
          * href="https://lists.w3.org/Archives/Public/ietf-http-wg/2008JulSep/att-0441/Shared_Dictionary_Compression_over_HTTP.pdf">
@@ -329,18 +153,11 @@ public abstract class CronetEngine {
          * @return the builder to facilitate chaining.
          */
         public Builder enableSdch(boolean value) {
-            mSdchEnabled = value;
+            mBuilderDelegate.enableSdch(value);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public boolean sdchEnabled() {
-            return mSdchEnabled;
-        }
-
-        /**
          * Enables
          * <a href="https://developer.chrome.com/multidevice/data-compression">Data
          * Reduction Proxy</a>. Defaults to disabled.
@@ -348,72 +165,32 @@ public abstract class CronetEngine {
          * @return the builder to facilitate chaining.
          */
         public Builder enableDataReductionProxy(String key) {
-            mDataReductionProxyKey = key;
+            mBuilderDelegate.enableDataReductionProxy(key);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public String dataReductionProxyKey() {
-            return mDataReductionProxyKey;
-        }
-
-        /**
-         * Overrides
-         * <a href="https://developer.chrome.com/multidevice/data-compression">
-         * Data Reduction Proxy</a> configuration parameters with a primary
-         * proxy name, fallback proxy name, and a secure proxy check URL. Proxies
-         * are specified as [scheme://]host[:port]. Used for testing.
-         * @param primaryProxy the primary data reduction proxy to use.
-         * @param fallbackProxy a fallback data reduction proxy to use.
-         * @param secureProxyCheckUrl a URL to fetch to determine if using a secure
-         * proxy is allowed.
+         * Sets whether the resulting {@link CronetEngine} uses an
+         * implementation based on the system's
+         * {@link java.net.HttpURLConnection} implementation, or if this is
+         * only done as a backup if the native implementation fails to load.
+         * Defaults to disabled.
+         * @param value {@code true} makes the resulting {@link CronetEngine}
+         *              use an implementation based on the system's
+         *              {@link java.net.HttpURLConnection} implementation
+         *              without trying to load the native implementation.
+         *              {@code false} makes the resulting {@code CronetEngine}
+         *              use the native implementation, or if that fails to load,
+         *              falls back to an implementation based on the system's
+         *              {@link java.net.HttpURLConnection} implementation.
          * @return the builder to facilitate chaining.
-         * @hide as it's a prototype.
          */
-        public Builder setDataReductionProxyOptions(
-                String primaryProxy, String fallbackProxy, String secureProxyCheckUrl) {
-            if (primaryProxy.isEmpty() || fallbackProxy.isEmpty()
-                    || secureProxyCheckUrl.isEmpty()) {
-                throw new IllegalArgumentException(
-                        "Primary and fallback proxies and check url must be set");
-            }
-            mDataReductionProxyPrimaryProxy = primaryProxy;
-            mDataReductionProxyFallbackProxy = fallbackProxy;
-            mDataReductionProxySecureProxyCheckUrl = secureProxyCheckUrl;
+        public Builder enableLegacyMode(boolean value) {
+            mBuilderDelegate.enableLegacyMode(value);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public String dataReductionProxyPrimaryProxy() {
-            return mDataReductionProxyPrimaryProxy;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public String dataReductionProxyFallbackProxy() {
-            return mDataReductionProxyFallbackProxy;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public String dataReductionProxySecureProxyCheckUrl() {
-            return mDataReductionProxySecureProxyCheckUrl;
-        }
-
-        /** @hide */
-        @IntDef({
-                HTTP_CACHE_DISABLED, HTTP_CACHE_IN_MEMORY, HTTP_CACHE_DISK_NO_HTTP, HTTP_CACHE_DISK,
-        })
-        @Retention(RetentionPolicy.SOURCE)
-        public @interface HttpCacheSetting {}
-
-        /**
          * Setting to disable HTTP cache. Some data may still be temporarily stored in memory.
          * Passed to {@link #enableHttpCache}.
          */
@@ -448,59 +225,12 @@ public abstract class CronetEngine {
          * exceeded at times).
          * @return the builder to facilitate chaining.
          */
-        public Builder enableHttpCache(@HttpCacheSetting int cacheMode, long maxSize) {
-            if (cacheMode == HTTP_CACHE_DISK || cacheMode == HTTP_CACHE_DISK_NO_HTTP) {
-                if (storagePath() == null) {
-                    throw new IllegalArgumentException("Storage path must be set");
-                }
-            } else {
-                if (storagePath() != null) {
-                    throw new IllegalArgumentException("Storage path must not be set");
-                }
-            }
-            mDisableCache =
-                    (cacheMode == HTTP_CACHE_DISABLED || cacheMode == HTTP_CACHE_DISK_NO_HTTP);
-            mHttpCacheMaxSize = maxSize;
-
-            switch (cacheMode) {
-                case HTTP_CACHE_DISABLED:
-                    mHttpCacheMode = HttpCacheType.DISABLED;
-                    break;
-                case HTTP_CACHE_DISK_NO_HTTP:
-                case HTTP_CACHE_DISK:
-                    mHttpCacheMode = HttpCacheType.DISK;
-                    break;
-                case HTTP_CACHE_IN_MEMORY:
-                    mHttpCacheMode = HttpCacheType.MEMORY;
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unknown cache mode");
-            }
+        public Builder enableHttpCache(int cacheMode, long maxSize) {
+            mBuilderDelegate.enableHttpCache(cacheMode, maxSize);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public boolean cacheDisabled() {
-            return mDisableCache;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public long httpCacheMaxSize() {
-            return mHttpCacheMaxSize;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public int httpCacheMode() {
-            return mHttpCacheMode;
-        }
-
-        /**
          * Adds hint that {@code host} supports QUIC.
          * Note that {@link #enableHttpCache enableHttpCache}
          * ({@link #HTTP_CACHE_DISK}) is needed to take advantage of 0-RTT
@@ -512,21 +242,11 @@ public abstract class CronetEngine {
          * @return the builder to facilitate chaining.
          */
         public Builder addQuicHint(String host, int port, int alternatePort) {
-            if (host.contains("/")) {
-                throw new IllegalArgumentException("Illegal QUIC Hint Host: " + host);
-            }
-            mQuicHints.add(new QuicHint(host, port, alternatePort));
+            mBuilderDelegate.addQuicHint(host, port, alternatePort);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public List<QuicHint> quicHints() {
-            return mQuicHints;
-        }
-
-        /**
          * <p>
          * Pins a set of public keys for a given host. By pinning a set of public keys,
          * {@code pinsSha256}, communication with {@code hostName} is required to
@@ -569,40 +289,12 @@ public abstract class CronetEngine {
          */
         public Builder addPublicKeyPins(String hostName, Set<byte[]> pinsSha256,
                 boolean includeSubdomains, Date expirationDate) {
-            if (hostName == null) {
-                throw new NullPointerException("The hostname cannot be null");
-            }
-            if (pinsSha256 == null) {
-                throw new NullPointerException("The set of SHA256 pins cannot be null");
-            }
-            if (expirationDate == null) {
-                throw new NullPointerException("The pin expiration date cannot be null");
-            }
-            String idnHostName = validateHostNameForPinningAndConvert(hostName);
-            // Convert the pin to BASE64 encoding. The hash set will eliminate duplications.
-            Set<byte[]> hashes = new HashSet<>(pinsSha256.size());
-            for (byte[] pinSha256 : pinsSha256) {
-                if (pinSha256 == null || pinSha256.length != 32) {
-                    throw new IllegalArgumentException("Public key pin is invalid");
-                }
-                hashes.add(pinSha256);
-            }
-            // Add new element to PKP list.
-            mPkps.add(new Pkp(idnHostName, hashes.toArray(new byte[hashes.size()][]),
-                    includeSubdomains, expirationDate));
+            mBuilderDelegate.addPublicKeyPins(
+                    hostName, pinsSha256, includeSubdomains, expirationDate);
             return this;
         }
 
         /**
-         * Returns list of public key pins.
-         * @return list of public key pins.
-         * @hide only used by internal implementation.
-         */
-        public List<Pkp> publicKeyPins() {
-            return mPkps;
-        }
-
-        /**
          * Enables or disables public key pinning bypass for local trust anchors. Disabling the
          * bypass for local trust anchors is highly discouraged since it may prohibit the app
          * from communicating with the pinned hosts. E.g., a user may want to send all traffic
@@ -616,282 +308,35 @@ public abstract class CronetEngine {
          * @return the builder to facilitate chaining.
          */
         public Builder enablePublicKeyPinningBypassForLocalTrustAnchors(boolean value) {
-            mPublicKeyPinningBypassForLocalTrustAnchorsEnabled = value;
+            mBuilderDelegate.enablePublicKeyPinningBypassForLocalTrustAnchors(value);
             return this;
         }
 
         /**
-         * @hide only used by internal implementation.
-         */
-        public boolean publicKeyPinningBypassForLocalTrustAnchorsEnabled() {
-            return mPublicKeyPinningBypassForLocalTrustAnchorsEnabled;
-        }
-
-        /**
-         * Checks whether a given string represents a valid host name for PKP and converts it
-         * to ASCII Compatible Encoding representation according to RFC 1122, RFC 1123 and
-         * RFC 3490. This method is more restrictive than required by RFC 7469. Thus, a host
-         * that contains digits and the dot character only is considered invalid.
-         *
-         * Note: Currently Cronet doesn't have native implementation of host name validation that
-         *       can be used. There is code that parses a provided URL but doesn't ensure its
-         *       correctness. The implementation relies on {@code getaddrinfo} function.
-         *
-         * @param hostName host name to check and convert.
-         * @return true if the string is a valid host name.
-         * @throws IllegalArgumentException if the the given string does not represent a valid
-         *                                  hostname.
-         */
-        private static String validateHostNameForPinningAndConvert(String hostName)
-                throws IllegalArgumentException {
-            if (INVALID_PKP_HOST_NAME.matcher(hostName).matches()) {
-                throw new IllegalArgumentException("Hostname " + hostName + " is illegal."
-                        + " A hostname should not consist of digits and/or dots only.");
-            }
-            // Workaround for crash, see crbug.com/634914
-            if (hostName.length() > 255) {
-                throw new IllegalArgumentException("Hostname " + hostName + " is too long."
-                        + " The name of the host does not comply with RFC 1122 and RFC 1123.");
-            }
-            try {
-                return IDN.toASCII(hostName, IDN.USE_STD3_ASCII_RULES);
-            } catch (IllegalArgumentException ex) {
-                throw new IllegalArgumentException("Hostname " + hostName + " is illegal."
-                        + " The name of the host does not comply with RFC 1122 and RFC 1123.");
-            }
-        }
-
-        /**
          * Sets experimental options to be used in Cronet.
          *
          * @param options JSON formatted experimental options.
          * @return the builder to facilitate chaining.
          */
         public Builder setExperimentalOptions(String options) {
-            mExperimentalOptions = options;
-            return this;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public String experimentalOptions() {
-            return mExperimentalOptions;
-        }
-
-        /**
-         * Sets a native MockCertVerifier for testing. See
-         * {@code MockCertVerifier.createMockCertVerifier} for a method that
-         * can be used to create a MockCertVerifier.
-         * @param mockCertVerifier pointer to native MockCertVerifier.
-         * @return the builder to facilitate chaining.
-         * @hide
-         */
-        @VisibleForTesting
-        public Builder setMockCertVerifierForTesting(long mockCertVerifier) {
-            mMockCertVerifier = mockCertVerifier;
-            return this;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public long mockCertVerifier() {
-            return mMockCertVerifier;
-        }
-
-        /**
-         * Enables the network quality estimator, which collects and reports
-         * measurements of round trip time (RTT) and downstream throughput at
-         * various layers of the network stack. After enabling the estimator,
-         * listeners of RTT and throughput can be added with
-         * {@link #addRttListener} and {@link #addThroughputListener} and
-         * removed with {@link #removeRttListener} and
-         * {@link #removeThroughputListener}. The estimator uses memory and CPU
-         * only when enabled.
-         * @param value {@code true} to enable network quality estimator,
-         *            {@code false} to disable.
-         * @hide as it's a prototype.
-         * @return the builder to facilitate chaining.
-         */
-        public Builder enableNetworkQualityEstimator(boolean value) {
-            mNetworkQualityEstimatorEnabled = value;
+            mBuilderDelegate.setExperimentalOptions(options);
             return this;
         }
 
         /**
-         * @return true if the network quality estimator has been enabled for
-         * this builder.
-         * @hide as it's a prototype and only used by internal implementation.
-         */
-        public boolean networkQualityEstimatorEnabled() {
-            return mNetworkQualityEstimatorEnabled;
-        }
-
-        /**
-         * Initializes CachingCertVerifier's cache with certVerifierData which has
-         * the results of certificate verification.
-         * @param certVerifierData a serialized representation of certificate
-         *        verification results.
-         * @return the builder to facilitate chaining.
-         */
-        public Builder setCertVerifierData(String certVerifierData) {
-            mCertVerifierData = certVerifierData;
-            return this;
-        }
-
-        /**
-         * @hide only used by internal implementation.
-         */
-        public String certVerifierData() {
-            return mCertVerifierData;
-        }
-
-        /**
-         * Returns {@link Context} for builder.
-         *
-         * @return {@link Context} for builder.
-         * @hide only used by internal implementation.
-         */
-        public Context getContext() {
-            return mContext;
-        }
-
-        /**
          * Build a {@link CronetEngine} using this builder's configuration.
          * @return constructed {@link CronetEngine}.
          */
         public CronetEngine build() {
-            if (getUserAgent() == null) {
-                setUserAgent(getDefaultUserAgent());
-            }
-            CronetEngine cronetEngine = null;
-            if (!legacyMode()) {
-                cronetEngine = createCronetEngine(this);
-            }
-            if (cronetEngine == null) {
-                cronetEngine = new JavaCronetEngine(getUserAgent());
-            }
-            Log.i(TAG, "Using network stack: " + cronetEngine.getVersionString());
-            // Clear MOCK_CERT_VERIFIER reference if there is any, since
-            // the ownership has been transferred to the engine.
-            mMockCertVerifier = 0;
-            return cronetEngine;
+            return mBuilderDelegate.build();
         }
-    }
-
-    private static final String TAG = "UrlRequestFactory";
-    private static final String CRONET_URL_REQUEST_CONTEXT =
-            "org.chromium.net.impl.CronetUrlRequestContext";
-
-    /**
-     * Creates a {@link UrlRequest} object. All callbacks will
-     * be called on {@code executor}'s thread. {@code executor} must not run
-     * tasks on the current thread to prevent blocking networking operations
-     * and causing exceptions during shutdown. Request is given medium priority,
-     * see {@link UrlRequest.Builder#REQUEST_PRIORITY_MEDIUM}. To specify other
-     * priorities see {@link #createRequest(String, UrlRequest.Callback,
-     * Executor, int priority)}.
-     *
-     * @param url {@link URL} for the request.
-     * @param callback callback object that gets invoked on different events.
-     * @param executor {@link Executor} on which all callbacks will be invoked.
-     * @return new request.
-     * @deprecated Use {@link UrlRequest.Builder#build}.
-     * @hide
-     */
-    @Deprecated
-    @SuppressLint("WrongConstant") // TODO(jbudorick): Remove this after rolling to the N SDK.
-    public final UrlRequest createRequest(
-            String url, UrlRequest.Callback callback, Executor executor) {
-        return createRequest(url, callback, executor, UrlRequest.Builder.REQUEST_PRIORITY_MEDIUM);
-    }
 
-    /**
-     * Creates a {@link UrlRequest} object. All callbacks will
-     * be called on {@code executor}'s thread. {@code executor} must not run
-     * tasks on the current thread to prevent blocking networking operations
-     * and causing exceptions during shutdown.
-     *
-     * @param url {@link URL} for the request.
-     * @param callback callback object that gets invoked on different events.
-     * @param executor {@link Executor} on which all callbacks will be invoked.
-     * @param priority priority of the request which should be one of the
-     *         {@link UrlRequest.Builder#REQUEST_PRIORITY_IDLE REQUEST_PRIORITY_*}
-     *         values.
-     * @return new request.
-     * @deprecated Use {@link UrlRequest.Builder#build}.
-     * @hide
-     */
-    @Deprecated
-    public final UrlRequest createRequest(String url, UrlRequest.Callback callback,
-            Executor executor, @UrlRequest.Builder.RequestPriority int priority) {
-        return createRequest(
-                url, callback, executor, priority, Collections.emptyList(), false, false, false);
+        ICronetEngineBuilder getBuilderDelegate() {
+            return mBuilderDelegate;
+        }
     }
 
     /**
-     * Creates a {@link UrlRequest} object. All callbacks will
-     * be called on {@code executor}'s thread. {@code executor} must not run
-     * tasks on the current thread to prevent blocking networking operations
-     * and causing exceptions during shutdown.
-     *
-     * @param url {@link URL} for the request.
-     * @param callback callback object that gets invoked on different events.
-     * @param executor {@link Executor} on which all callbacks will be invoked.
-     * @param priority priority of the request which should be one of the
-     *         {@link UrlRequest.Builder#REQUEST_PRIORITY_IDLE REQUEST_PRIORITY_*}
-     *         values.
-     * @param requestAnnotations Objects to pass on to {@link RequestFinishedInfo.Listener}.
-     * @param disableCache disables cache for the request.
-     *         If context is not set up to use cache this param has no effect.
-     * @param disableConnectionMigration disables connection migration for this
-     *         request if it is enabled for the session.
-     * @param allowDirectExecutor whether executors used by this request are permitted
-     *         to execute submitted tasks inline.
-     * @return new request.
-     * @deprecated Use {@link UrlRequest.Builder#build}.
-     * @hide as it references hidden RequestFinishedInfo.Listener
-     */
-    @Deprecated
-    protected abstract UrlRequest createRequest(String url, UrlRequest.Callback callback,
-            Executor executor, int priority, Collection<Object> requestAnnotations,
-            boolean disableCache, boolean disableConnectionMigration, boolean allowDirectExecutor);
-
-    /**
-     * Creates a {@link BidirectionalStream} object. {@code callback} methods will
-     * be invoked on {@code executor}. {@code executor} must not run
-     * tasks on the current thread to prevent blocking networking operations
-     * and causing exceptions during shutdown.
-     *
-     * @param url the URL for the stream
-     * @param callback the object whose methods get invoked upon different events
-     * @param executor the {@link Executor} on which all callbacks will be called
-     * @param httpMethod the HTTP method to use for the stream
-     * @param requestHeaders the list of request headers
-     * @param priority priority of the stream which should be one of the
-     *         {@link BidirectionalStream.Builder#STREAM_PRIORITY_IDLE STREAM_PRIORITY_*}
-     *         values.
-     * @param delayRequestHeadersUntilFirstFlush whether to delay sending request
-     *         headers until flush() is called, and try to combine them
-     *         with the next data frame.
-     * @param requestAnnotations Objects to pass on to {@link RequestFinishedInfo.Listener}.
-     * @return a new stream.
-     * @hide only used by internal implementation.
-     */
-    public abstract BidirectionalStream createBidirectionalStream(String url,
-            BidirectionalStream.Callback callback, Executor executor, String httpMethod,
-            List<Map.Entry<String, String>> requestHeaders,
-            @BidirectionalStream.Builder.StreamPriority int priority,
-            boolean delayRequestHeadersUntilFirstFlush, Collection<Object> requestAnnotations);
-
-    /**
-     * @return {@code true} if the engine is enabled.
-     * @hide only used by internal implementation.
-     */
-    public abstract boolean isEnabled();
-
-    /**
      * @return a human-readable version string of the engine.
      */
     public abstract String getVersionString();
@@ -925,24 +370,6 @@ public abstract class CronetEngine {
     public abstract void startNetLogToFile(String fileName, boolean logAll);
 
     /**
-     * Starts NetLog logging to a specified directory with a bounded size. The NetLog will contain
-     * events emitted by all live CronetEngines. The NetLog is useful for debugging.
-     * The log can be viewed by stitching the files using net/log/stitch_net_log_files.py and
-     * using a Chrome browser navigated to chrome://net-internals/#import
-     * @param dirPath the directory where the log files will be created. It must already exist.
-     *            NetLog files must not already exist in the directory. If actively logging,
-     *            this method is ignored.
-     * @param logAll {@code true} to include basic events, user cookies,
-     *            credentials and all transferred bytes in the log. This option presents a
-     *            privacy risk, since it exposes the user's credentials, and should only be
-     *            used with the user's consent and in situations where the log won't be public.
-     *            {@code false} to just include basic events.
-     * @param maxSize the maximum total disk space in bytes that should be used by NetLog. Actual
-     *            disk space usage may exceed this limit slightly.
-     */
-    public abstract void startNetLogToDisk(String dirPath, boolean logAll, int maxSize);
-
-    /**
      * Stops NetLog logging and flushes file to disk. If a logging session is
      * not in progress, this call is ignored.
      */
@@ -963,7 +390,7 @@ public abstract class CronetEngine {
 
     /**
      * Returns differences in metrics collected by Cronet since the last call to
-     * {@link #getGlobalMetricsDeltas}.
+     * this method.
      * <p>
      * Cronet collects these metrics globally. This means deltas returned by
      * {@code getGlobalMetricsDeltas()} will include measurements of requests
@@ -986,70 +413,6 @@ public abstract class CronetEngine {
     public abstract byte[] getGlobalMetricsDeltas();
 
     /**
-     * Returns the effective connection type computed by the network quality
-     * estimator.
-     * @hide as it's a prototype.
-     */
-    public abstract int getEffectiveConnectionType();
-
-    /**
-     * Configures the network quality estimator for testing. This must be called
-     * before round trip time and throughput listeners are added, and after the
-     * network quality estimator has been enabled.
-     * @param useLocalHostRequests include requests to localhost in estimates.
-     * @param useSmallerResponses include small responses in throughput
-     * estimates.
-     * @hide as it's a prototype.
-     */
-    public abstract void configureNetworkQualityEstimatorForTesting(
-            boolean useLocalHostRequests, boolean useSmallerResponses);
-
-    /**
-     * Registers a listener that gets called whenever the network quality
-     * estimator witnesses a sample round trip time. This must be called
-     * after {@link #enableNetworkQualityEstimator}, and with throw an
-     * exception otherwise. Round trip times may be recorded at various layers
-     * of the network stack, including TCP, QUIC, and at the URL request layer.
-     * The listener is called on the {@link java.util.concurrent.Executor} that
-     * is passed to {@link #enableNetworkQualityEstimator}.
-     * @param listener the listener of round trip times.
-     * @hide as it's a prototype.
-     */
-    public abstract void addRttListener(NetworkQualityRttListener listener);
-
-    /**
-     * Removes a listener of round trip times if previously registered with
-     * {@link #addRttListener}. This should be called after a
-     * {@link NetworkQualityRttListener} is added in order to stop receiving
-     * observations.
-     * @param listener the listener of round trip times.
-     * @hide as it's a prototype.
-     */
-    public abstract void removeRttListener(NetworkQualityRttListener listener);
-
-    /**
-     * Registers a listener that gets called whenever the network quality
-     * estimator witnesses a sample throughput measurement. This must be called
-     * after {@link #enableNetworkQualityEstimator}. Throughput observations
-     * are computed by measuring bytes read over the active network interface
-     * at times when at least one URL response is being received. The listener
-     * is called on the {@link java.util.concurrent.Executor} that is passed to
-     * {@link #enableNetworkQualityEstimator}.
-     * @param listener the listener of throughput.
-     * @hide as it's a prototype.
-     */
-    public abstract void addThroughputListener(NetworkQualityThroughputListener listener);
-
-    /**
-     * Removes a listener of throughput. This should be called after a
-     * {@link NetworkQualityThroughputListener} is added with
-     * {@link #addThroughputListener} in order to stop receiving observations.
-     * @param listener the listener of throughput.
-     * @hide as it's a prototype.
-     */
-    public abstract void removeThroughputListener(NetworkQualityThroughputListener listener);
-
-    /**
      * Establishes a new connection to the resource specified by the {@link URL} {@code url}.
      * <p>
      * <b>Note:</b> Cronet's {@link java.net.HttpURLConnection} implementation is subject to certain
@@ -1062,21 +425,6 @@ public abstract class CronetEngine {
     public abstract URLConnection openConnection(URL url) throws IOException;
 
     /**
-     * Establishes a new connection to the resource specified by the {@link URL} {@code url}
-     * using the given proxy.
-     * <p>
-     * <b>Note:</b> Cronet's {@link java.net.HttpURLConnection} implementation is subject to certain
-     * limitations, see {@link #createURLStreamHandlerFactory} for details.
-     *
-     * @param url URL of resource to connect to.
-     * @param proxy proxy to use when establishing connection.
-     * @return an {@link java.net.HttpURLConnection} instance implemented by this CronetEngine.
-     * @throws IOException if an error occurs while opening the connection.
-     * @hide TODO(pauljensen): Expose once implemented, http://crbug.com/418111
-     */
-    public abstract URLConnection openConnection(URL url, Proxy proxy) throws IOException;
-
-    /**
      * Creates a {@link URLStreamHandlerFactory} to handle HTTP and HTTPS
      * traffic. An instance of this class can be installed via
      * {@link URL#setURLStreamHandlerFactory} thus using this CronetEngine by default for
@@ -1109,49 +457,17 @@ public abstract class CronetEngine {
      */
     public abstract URLStreamHandlerFactory createURLStreamHandlerFactory();
 
-    private static CronetEngine createCronetEngine(Builder builder) {
-        CronetEngine cronetEngine = null;
-        try {
-            Class<? extends CronetEngine> engineClass =
-                    builder.getContext()
-                            .getClassLoader()
-                            .loadClass(CRONET_URL_REQUEST_CONTEXT)
-                            .asSubclass(CronetEngine.class);
-            Constructor<? extends CronetEngine> constructor =
-                    engineClass.getConstructor(Builder.class);
-            CronetEngine possibleEngine = constructor.newInstance(builder);
-            if (possibleEngine.isEnabled()) {
-                cronetEngine = possibleEngine;
-            }
-        } catch (ClassNotFoundException e) {
-            // Leave as null.
-        } catch (Exception e) {
-            throw new IllegalStateException("Cannot instantiate: " + CRONET_URL_REQUEST_CONTEXT, e);
-        }
-        return cronetEngine;
-    }
-
     /**
-     * Registers a listener that gets called after the end of each request with the request info.
-     *
-     * <p>This must be called after {@link #enableNetworkQualityEstimator} and will throw an
-     * exception otherwise.
-     *
-     * <p>The listener is called on the {@link java.util.concurrent.Executor} that
-     * is passed to {@link #enableNetworkQualityEstimator}.
+     * Creates a builder for {@link UrlRequest} objects. All callbacks for
+     * generated {@link UrlRequest} objects will be invoked on
+     * {@code executor}'s thread. {@code executor} must not run tasks on the
+     * current thread to prevent blocking networking operations and causing
+     * exceptions during shutdown.
      *
-     * @param listener the listener for finished requests.
-     *
-     * @hide as it's a prototype.
-     */
-    public abstract void addRequestFinishedListener(RequestFinishedInfo.Listener listener);
-
-    /**
-     * Removes a finished request listener.
-     *
-     * @param listener the listener to remove.
-     *
-     * @hide it's a prototype.
+     * @param url {@link java.net.URL} for the generated requests.
+     * @param callback callback object that gets invoked on different events.
+     * @param executor {@link Executor} on which all callbacks will be invoked.
      */
-    public abstract void removeRequestFinishedListener(RequestFinishedInfo.Listener listener);
+    public abstract UrlRequest.Builder newUrlRequestBuilder(
+            String url, UrlRequest.Callback callback, Executor executor);
 }