[Cronet] Test the libcronet that's shipped, not libcronet_test

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..82e6d9156bbf22380993626f3ca2bb5037aa89e3 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,11 +7,12 @@ package org.chromium.net;
 import android.os.ConditionVariable;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 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 java.io.BufferedReader;
 import java.io.FileReader;
@@ -68,9 +69,8 @@ public class SdchTest extends CronetTestBase {
     public void testSdchEnabled() throws Exception {
         setUp(Sdch.ENABLED);
         String targetUrl = NativeTestServer.getSdchURL() + "/sdch/test";
-        long contextAdapter =
-                getContextAdapter((CronetUrlRequestContext) mTestFramework.mCronetEngine);
-        DictionaryAddedObserver observer = new DictionaryAddedObserver(targetUrl, contextAdapter);
+        CronetUrlRequestContext context = (CronetUrlRequestContext) mTestFramework.mCronetEngine;
+        DictionaryAddedObserver observer = new DictionaryAddedObserver(targetUrl, context);
 
         // Make a request to /sdch which advertises the dictionary.
         TestUrlRequestCallback callback1 = startAndWaitForComplete(mTestFramework.mCronetEngine,
@@ -99,9 +99,7 @@ public class SdchTest extends CronetTestBase {
         mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(
                 null, mTestFramework.getCronetEngineBuilder());
         CronetUrlRequestContext newContext = (CronetUrlRequestContext) mTestFramework.mCronetEngine;
-        long newContextAdapter = getContextAdapter(newContext);
-        DictionaryAddedObserver newObserver =
-                new DictionaryAddedObserver(targetUrl, newContextAdapter);
+        DictionaryAddedObserver newObserver = new DictionaryAddedObserver(targetUrl, newContext);
         newObserver.waitForDictionaryAdded();
 
         // Make a request to fetch encoded response at /sdch/test.
@@ -148,8 +146,8 @@ public class SdchTest extends CronetTestBase {
     private static class DictionaryAddedObserver extends SdchObserver {
         ConditionVariable mBlock = new ConditionVariable();
 
-        public DictionaryAddedObserver(String targetUrl, long contextAdapter) {
-            super(targetUrl, contextAdapter);
+        public DictionaryAddedObserver(String targetUrl, CronetUrlRequestContext context) {
+            super(targetUrl, context);
         }
 
         @Override
@@ -165,10 +163,6 @@ public class SdchTest extends CronetTestBase {
         }
     }
 
-    private long getContextAdapter(CronetUrlRequestContext requestContext) {
-        return requestContext.getUrlRequestContextAdapter();
-    }
-
     private TestUrlRequestCallback startAndWaitForComplete(CronetEngine cronetEngine, String url)
             throws Exception {
         TestUrlRequestCallback callback = new TestUrlRequestCallback();