Cronet API Refactoring

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
index 918ec0282bcf1e4fd35347f6929d296320f3ae65..b74a7f17dbf4f264fde116aeb9fb601aec4b6f7b 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
@@ -8,7 +8,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.PathUtils;
 import org.chromium.base.test.util.Feature;
-import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
 import org.json.JSONObject;
 
 import java.io.BufferedReader;
@@ -21,14 +20,15 @@ import java.io.FileReader;
 public class ExperimentalOptionsTest extends CronetTestBase {
     private static final String TAG = "cr.QuicTest";
     private CronetTestFramework mTestFramework;
-    private CronetEngine.Builder mBuilder;
+    private ExperimentalCronetEngine.Builder mBuilder;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         System.loadLibrary("cronet_tests");
-        mBuilder = new CronetEngine.Builder(getContext());
-        mBuilder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier());
+        mBuilder = new ExperimentalCronetEngine.Builder(getContext());
+        CronetTestUtil.setMockCertVerifierForTesting(
+                mBuilder, QuicTestServer.createMockCertVerifier());
         assertTrue(Http2TestServer.startHttp2TestServer(
                 getContext(), QuicTestServer.getServerCert(), QuicTestServer.getServerCertKey()));
     }
@@ -55,8 +55,8 @@ public class ExperimentalOptionsTest extends CronetTestBase {
         mTestFramework = new CronetTestFramework(null, null, getContext(), mBuilder);
 
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder builder = new UrlRequest.Builder(
-                url, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
+        UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
+                url, callback, callback.getExecutor());
         UrlRequest urlRequest = builder.build();
         urlRequest.start();
         callback.blockForDone();