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

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 1e433d90b421694647c8879178a37bb272a7adc3..1015855accd078cdf931f38e802d1802113f2554 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
@@ -12,6 +12,8 @@ import android.os.Looper;
 import android.os.StrictMode;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import org.json.JSONObject;
+
 import org.chromium.base.FileUtils;
 import org.chromium.base.PathUtils;
 import org.chromium.base.annotations.JNINamespace;
@@ -21,7 +23,6 @@ import org.chromium.net.TestUrlRequestCallback.ResponseStep;
 import org.chromium.net.impl.CronetLibraryLoader;
 import org.chromium.net.impl.CronetUrlRequestContext;
 import org.chromium.net.test.EmbeddedTestServer;
-import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -160,7 +161,6 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
             cronetEngineBuilder.enableLegacyMode(true);
         }
         cronetEngineBuilder.setUserAgent(userAgentValue);
-        cronetEngineBuilder.setLibraryName("cronet_tests");
         final CronetTestFramework testFramework =
                 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(mUrl, cronetEngineBuilder);
         NativeTestServer.shutdownNativeTestServer(); // startNativeTestServer returns false if it's
@@ -182,7 +182,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         // Ensure native code is loaded before trying to start test server.
-        new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests").build().shutdown();
+        new CronetEngine.Builder(getContext()).build().shutdown();
 
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
         if (!NativeTestServer.isDataReductionProxySupported()) {
@@ -197,7 +197,6 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         cronetEngineBuilder.enableDataReductionProxy("test-key");
         cronetEngineBuilder.setDataReductionProxyOptions(serverHostPort, "unused.net:9999",
                 NativeTestServer.getFileURL("/secureproxychecksuccess.txt"));
-        cronetEngineBuilder.setLibraryName("cronet_tests");
         testFramework.mCronetEngine = cronetEngineBuilder.build();
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
 
@@ -521,8 +520,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         Context context = getContext();
         File directory = new File(PathUtils.getDataDirectory());
         File file = File.createTempFile("cronet", "json", directory);
-        CronetEngine cronetEngine = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+        CronetEngine cronetEngine = new CronetUrlRequestContext(new CronetEngine.Builder(context));
         // Start NetLog immediately after the request context is created to make
         // sure that the call won't crash the app even when the native request
         // context is not fully initialized. See crbug.com/470196.
@@ -552,8 +550,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         assertFalse(netLogDir.exists());
         assertTrue(netLogDir.mkdir());
         File eventFile = new File(netLogDir, "event_file_0.json");
-        CronetEngine cronetEngine = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+        CronetEngine cronetEngine = new CronetUrlRequestContext(new CronetEngine.Builder(context));
         // Start NetLog immediately after the request context is created to make
         // sure that the call won't crash the app even when the native request
         // context is not fully initialized. See crbug.com/470196.
@@ -582,8 +579,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         Context context = getContext();
         File directory = new File(PathUtils.getDataDirectory());
         File file = File.createTempFile("cronet", "json", directory);
-        CronetEngine cronetEngine = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+        CronetEngine cronetEngine = new CronetUrlRequestContext(new CronetEngine.Builder(context));
         cronetEngine.startNetLogToFile(file.getPath(), false);
 
         // Start a request.
@@ -613,8 +609,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         assertFalse(netLogDir.exists());
         assertTrue(netLogDir.mkdir());
         File eventFile = new File(netLogDir, "event_file_0.json");
-        CronetEngine cronetEngine = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+        CronetEngine cronetEngine = new CronetUrlRequestContext(new CronetEngine.Builder(context));
         cronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE);
 
         // Start a request.
@@ -641,10 +636,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         File directory = new File(PathUtils.getDataDirectory());
         File file1 = File.createTempFile("cronet1", "json", directory);
         File file2 = File.createTempFile("cronet2", "json", directory);
-        CronetEngine cronetEngine1 = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
-        CronetEngine cronetEngine2 = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+        CronetEngine cronetEngine1 = new CronetUrlRequestContext(new CronetEngine.Builder(context));
+        CronetEngine cronetEngine2 = new CronetUrlRequestContext(new CronetEngine.Builder(context));
 
         cronetEngine1.startNetLogToFile(file1.getPath(), false);
         cronetEngine2.startNetLogToFile(file2.getPath(), false);
@@ -690,10 +683,10 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         File eventFile1 = new File(netLogDir1, "event_file_0.json");
         File eventFile2 = new File(netLogDir2, "event_file_0.json");
 
-        CronetUrlRequestContext cronetEngine1 = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
-        CronetUrlRequestContext cronetEngine2 = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+        CronetUrlRequestContext cronetEngine1 =
+                new CronetUrlRequestContext(new CronetEngine.Builder(context));
+        CronetUrlRequestContext cronetEngine2 =
+                new CronetUrlRequestContext(new CronetEngine.Builder(context));
 
         cronetEngine1.startNetLogToDisk(netLogDir1.getPath(), false, MAX_FILE_SIZE);
         cronetEngine2.startNetLogToDisk(netLogDir2.getPath(), false, MAX_FILE_SIZE);
@@ -1003,8 +996,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         Context context = getContext();
         File directory = new File(PathUtils.getDataDirectory());
         File file = File.createTempFile("cronet", "json", directory);
-        CronetEngine cronetEngine = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+        CronetEngine cronetEngine = new CronetUrlRequestContext(new CronetEngine.Builder(context));
         // Start NetLog with logAll as true.
         cronetEngine.startNetLogToFile(file.getPath(), true);
         // Start a request.
@@ -1031,8 +1023,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         assertFalse(netLogDir.exists());
         assertTrue(netLogDir.mkdir());
         File eventFile = new File(netLogDir, "event_file_0.json");
-        CronetUrlRequestContext cronetEngine = new CronetUrlRequestContext(
-                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+        CronetUrlRequestContext cronetEngine =
+                new CronetUrlRequestContext(new CronetEngine.Builder(context));
         // Start NetLog with logAll as true.
         cronetEngine.startNetLogToDisk(netLogDir.getPath(), true, MAX_FILE_SIZE);
         // Start a request.
@@ -1393,7 +1385,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     public void testSkipLibraryLoading() throws Exception {
         CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
         TestBadLibraryLoader loader = new TestBadLibraryLoader();
-        builder.setLibraryLoader(loader).setLibraryName("cronet_tests");
+        builder.setLibraryLoader(loader);
         try {
             // ensureInitialized() calls native code to check the version right after library load
             // and will error with the message below if library loading was skipped
@@ -1413,8 +1405,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         final ConditionVariable uiThreadDone = new ConditionVariable();
         new Handler(Looper.getMainLooper()).post(new Runnable() {
             public void run() {
-                final CronetEngine.Builder builder =
-                        new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests");
+                final CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
                 new Thread() {
                     public void run() {
                         CronetEngine cronetEngine = builder.build();