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

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.os.ConditionVariable;
 import android.os.ParcelFileDescriptor;
 import android.os.StrictMode;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
 /** Test the default provided implementations of {@link UploadDataProvider} */
 public class UploadDataProvidersTest extends CronetTestBase {
     private static final String LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
             + "Proin elementum, libero laoreet fringilla faucibus, metus tortor vehicula ante, "
             + "lacinia lorem eros vel sapien.";
     private CronetTestFramework mTestFramework;
     private File mFile;
     private StrictMode.VmPolicy mOldVmPolicy;
+    private MockUrlRequestJobFactory mMockUrlRequestJobFactory;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mOldVmPolicy = StrictMode.getVmPolicy();
         StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
                                        .detectLeakedClosableObjects()
                                        .penaltyLog()
                                        .penaltyDeath()
                                        .build());
         mTestFramework = startCronetTestFramework();
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
         // Add url interceptors after native application context is initialized.
-        MockUrlRequestJobFactory.setUp();
+        mMockUrlRequestJobFactory = new MockUrlRequestJobFactory(mTestFramework.mCronetEngine);
         mFile = new File(getContext().getCacheDir().getPath() + "/tmpfile");
         FileOutputStream fileOutputStream = new FileOutputStream(mFile);
         try {
             fileOutputStream.write(LOREM.getBytes("UTF-8"));
         } finally {
             fileOutputStream.close();
         }
     }
 
     @SuppressFBWarnings("DM_GC") // Used to trigger strictmode detecting leaked closeables
     @Override
     protected void tearDown() throws Exception {
         try {
+            mMockUrlRequestJobFactory.shutdown();
             NativeTestServer.shutdownNativeTestServer();
             mTestFramework.mCronetEngine.shutdown();
             assertTrue(mFile.delete());
             // Run GC and finalizers a few times to pick up leaked closeables
             for (int i = 0; i < 10; i++) {
                 System.gc();
                 System.runFinalization();
             }
             System.gc();
             System.runFinalization();
@@ skipping 161 matching lines @@
                 UploadDataProviders.create(uploadDataWithPadding, offset, uploadData.length);
         assertEquals(uploadData.length, dataProvider.getLength());
         builder.setUploadDataProvider(dataProvider, callback.getExecutor());
         UrlRequest urlRequest = builder.build();
         urlRequest.start();
         callback.blockForDone();
         assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
         assertEquals(LOREM, callback.mResponseAsString);
     }
 }