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

components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java

Index: components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java
diff --git a/components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java b/components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java
index 553c0e44674f598226b6eed38aa34653c042c2a5..5032df518b7114e378a1f9ca0fbbfdf089206000 100644
--- a/components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java
+++ b/components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java
@@ -4,22 +4,19 @@
 
 package org.chromium.net;
 
-import android.os.ConditionVariable;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.net.impl.CronetEngineBuilderImpl;
 import org.chromium.net.impl.CronetUrlRequest;
+import org.chromium.net.impl.CronetUrlRequestContext;
 
 /**
  * Utilities for Cronet testing
  */
 @JNINamespace("cronet")
 public class CronetTestUtil {
-    private static final ConditionVariable sHostResolverBlock = new ConditionVariable();
-
     static final String SDCH_FAKE_HOST = "fake.sdch.domain";
     // QUIC test domain must match the certificate used
     // (quic_test.example.com.crt and quic_test.example.com.key.pkcs8), and
@@ -60,6 +57,22 @@ public class CronetTestUtil {
     }
 
     /**
+     * Prepare {@code cronetEngine}'s network thread so libcronet_test code can run on it.
+     */
+    public static class NetworkThreadTestConnector {
+        private final CronetUrlRequestContext mRequestContext;
+
+        public NetworkThreadTestConnector(CronetEngine cronetEngine) {
+            mRequestContext = (CronetUrlRequestContext) cronetEngine;
+            nativePrepareNetworkThread(mRequestContext.getUrlRequestContextAdapter());
+        }
+
+        public void shutdown() {
+            nativeCleanupNetworkThread(mRequestContext.getUrlRequestContextAdapter());
+        }
+    }
+
+    /**
      * Returns the value of load flags in |urlRequest|.
      * @param urlRequest is the UrlRequest object of interest.
      */
@@ -72,14 +85,13 @@ public class CronetTestUtil {
         getCronetEngineBuilderImpl(builder).setMockCertVerifierForTesting(mockCertVerifier);
     }
 
-    public static void setLibraryName(ExperimentalCronetEngine.Builder builder, String libName) {
-        getCronetEngineBuilderImpl(builder).setLibraryName(libName);
-    }
-
     public static CronetEngineBuilderImpl getCronetEngineBuilderImpl(
             ExperimentalCronetEngine.Builder builder) {
         return (CronetEngineBuilderImpl) builder.getBuilderDelegate();
     }
 
-    private static native int nativeGetLoadFlags(long urlRequest);
+    private static native int nativeGetLoadFlags(long urlRequestAdapter);
+
+    private static native void nativePrepareNetworkThread(long contextAdapter);
+    private static native void nativeCleanupNetworkThread(long contextAdapter);
 }