Cronet: a framework to provide alternative Cronet implementations

components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
index c0b8d3c0b3ec465497fc4dae04d51958e2718325..bf932bd4c764db4481e542963cd1626ffa2938ab 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
@@ -10,6 +10,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.PathUtils;
 import org.chromium.net.impl.CronetEngineBase;
 import org.chromium.net.impl.JavaCronetEngine;
+import org.chromium.net.impl.JavaCronetProvider;
 import org.chromium.net.impl.UserAgent;
 
 import java.lang.annotation.ElementType;
@@ -132,10 +133,8 @@ public class CronetTestBase extends AndroidTestCase {
                 super.runTest();
                 if (!method.isAnnotationPresent(OnlyRunNativeCronet.class)) {
                     if (mCronetTestFramework != null) {
-                        ExperimentalCronetEngine.Builder builder =
-                                new ExperimentalCronetEngine.Builder(getContext());
+                        ExperimentalCronetEngine.Builder builder = createJavaEngineBuilder();
                         builder.setUserAgent(UserAgent.from(getContext()));
-                        builder.enableLegacyMode(true);
                         mCronetTestFramework.mCronetEngine = (CronetEngineBase) builder.build();
                         // Make sure that the instantiated engine is JavaCronetEngine.
                         assert mCronetTestFramework.mCronetEngine.getClass()
@@ -152,6 +151,16 @@ public class CronetTestBase extends AndroidTestCase {
         }
     }
 
+    /**
+     * Creates and returns {@link ExperimentalCronetEngine.Builder} that creates
+     * Java (platform) based {@link CronetEngine.Builder}.
+     *
+     * @return the {@code CronetEngine.Builder} that builds Java-based {@code Cronet engine}.
+     */
+    ExperimentalCronetEngine.Builder createJavaEngineBuilder() {
+        return (ExperimentalCronetEngine.Builder) new JavaCronetProvider(mContext).createBuilder();
+    }
+
     public void assertResponseEquals(UrlResponseInfo expected, UrlResponseInfo actual) {
         assertEquals(expected.getAllHeaders(), actual.getAllHeaders());
         assertEquals(expected.getAllHeadersAsList(), actual.getAllHeadersAsList());