Cronet API Refactoring

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java
index a8704b98819d030d578fe0c62f53a1143473ec1d..418748fac9e6acfa7009a461147a59ef8d303d13 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java
@@ -7,12 +7,12 @@ package org.chromium.net;
 import android.os.ConditionVariable;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.test.util.Feature;
-import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
-import org.chromium.net.impl.CronetUrlRequestContext;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import org.chromium.base.test.util.Feature;
+import org.chromium.net.impl.CronetUrlRequestContext;
+
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
@@ -45,7 +45,8 @@ public class SdchTest extends CronetTestBase {
         commandLineArgs.add(CronetTestFramework.LibraryInitType.CRONET);
 
         String[] args = new String[commandLineArgs.size()];
-        CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
+        ExperimentalCronetEngine.Builder builder =
+                new ExperimentalCronetEngine.Builder(getContext());
         JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules();
         JSONObject experimentalOptions =
                 new JSONObject().put("HostResolverRules", hostResolverParams);
@@ -173,7 +174,7 @@ public class SdchTest extends CronetTestBase {
             throws Exception {
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
         UrlRequest.Builder builder =
-                new UrlRequest.Builder(url, callback, callback.getExecutor(), cronetEngine);
+                cronetEngine.newUrlRequestBuilder(url, callback, callback.getExecutor());
         builder.build().start();
         callback.blockForDone();
         return callback;