[Cronet] Fix two races/leaks in JavaUrlRequest

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java
index 4e1865296c067f6434fdf75f54f9ee98a2f27ce9..5f985322189679252edf545b0a94404d8b5e3a4c 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java
@@ -6,10 +6,8 @@ package org.chromium.net;
 
 import android.os.ConditionVariable;
 import android.os.ParcelFileDescriptor;
-import android.os.StrictMode;
 import android.support.test.filters.SmallTest;
 
-import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
 
 import java.io.File;
@@ -24,18 +22,11 @@ public class UploadDataProvidersTest extends CronetTestBase {
             + "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.
@@ -49,25 +40,13 @@ public class UploadDataProvidersTest extends CronetTestBase {
         }
     }
 
-    @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();
-            super.tearDown();
-        } finally {
-            StrictMode.setVmPolicy(mOldVmPolicy);
-        }
+        mMockUrlRequestJobFactory.shutdown();
+        NativeTestServer.shutdownNativeTestServer();
+        mTestFramework.mCronetEngine.shutdown();
+        assertTrue(mFile.delete());
+        super.tearDown();
     }
 
     @SmallTest