Cronet: a framework for providing alternative Cronet implementations

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index e6390ea63afc9547b49ea1e214d61d21791ba6cd..37168cff8354ff6daefff694311ee28deba6709b 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -163,7 +163,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         ExperimentalCronetEngine.Builder cronetEngineBuilder =
                 new ExperimentalCronetEngine.Builder(getContext());
         if (testingJavaImpl()) {
-            cronetEngineBuilder.enableLegacyMode(true);
+            cronetEngineBuilder = createJavaEngineBuilder();
         }
         cronetEngineBuilder.setUserAgent(userAgentValue);
         final CronetTestFramework testFramework =
@@ -1368,7 +1368,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         // This is to prompt load of native library.
         startCronetTestFramework();
         // Verify CronetEngine.Builder config is passed down accurately to native code.
-        CronetEngineBuilderImpl builder = new CronetEngineBuilderImpl(getContext());
+        CronetEngineBuilderImpl builder =

[mef, 2017/01/18 20:57:54]

nit: Can we make |builder| be a CronetEngine.Builder and do
CronetUrlRequestContext.createNativeUrlRequestContextConfig((CronetEngineBuilderImpl)
builder.mDelegate) down below?

[kapishnikov, 2017/01/19 01:25:25]

Good idea. Done!

+                (CronetEngineBuilderImpl) new CronetEngine.Builder(getContext()).mBuilderDelegate;
         builder.enableHttp2(false);
         builder.enableQuic(true);
         builder.enableSdch(true);
@@ -1407,7 +1408,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
     public void testSkipLibraryLoading() throws Exception {
-        CronetEngineBuilderImpl builder = new CronetEngineBuilderImpl(getContext());
+        CronetEngineBuilderImpl builder =

[mef, 2017/01/18 20:57:54]

nit: Can we make |builder| be a CronetEngine.Builder?

+                (CronetEngineBuilderImpl) new CronetEngine.Builder(getContext()).mBuilderDelegate;
         TestBadLibraryLoader loader = new TestBadLibraryLoader();
         builder.setLibraryLoader(loader);
         try {