[Cleanup] Remove a param used to customize test behavior.

android_webview/javatests/src/org/chromium/android_webview/test/crash/MinidumpUploaderTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/crash/MinidumpUploaderTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/crash/MinidumpUploaderTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/crash/MinidumpUploaderTest.java
index a12000f9debc175f1f2b9603e33640edd9c70922..e79a095079f9432fdcf59a2b38186833773a4769 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/crash/MinidumpUploaderTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/crash/MinidumpUploaderTest.java
@@ -74,15 +74,23 @@ public class MinidumpUploaderTest extends CrashTestCase {
     }
 
     private static class TestMinidumpUploaderImpl extends MinidumpUploaderImpl {
-        private CrashReportingPermissionManager mPermissionManager;
+        private final CrashReportingPermissionManager mPermissionManager;
 
-        TestMinidumpUploaderImpl(Context context, CrashReportingPermissionManager permissionManager,
-                boolean cleanOutMinidumps) {
-            super(context, cleanOutMinidumps);
+        TestMinidumpUploaderImpl(
+                Context context, CrashReportingPermissionManager permissionManager) {
+            super(context);
             mPermissionManager = permissionManager;
         }
 
         @Override
+        public CrashFileManager createCrashFileManager(File crashDir) {
+            return new CrashFileManager(crashDir) {
+                @Override
+                public void cleanOutAllNonFreshMinidumpFiles() {}
+            };
+        }
+
+        @Override
         public MinidumpUploadCallable createMinidumpUploadCallable(
                 File minidumpFile, File logfile) {
             return new MinidumpUploadCallable(minidumpFile, logfile,
@@ -115,8 +123,7 @@ public class MinidumpUploaderTest extends CrashTestCase {
                     }
                 };
         MinidumpUploader minidumpUploader =
-                new TestMinidumpUploaderImpl(getInstrumentation().getTargetContext(), permManager,
-                        false /* cleanOutMinidumps */);
+                new TestMinidumpUploaderImpl(getInstrumentation().getTargetContext(), permManager);
 
         File firstFile = createMinidumpFileInCrashDir("1_abc.dmp0");
         File secondFile = createMinidumpFileInCrashDir("12_abc.dmp0");
@@ -207,8 +214,7 @@ public class MinidumpUploaderTest extends CrashTestCase {
                     { mIsEnabledForTests = true; }
                 };
         MinidumpUploader minidumpUploader =
-                new TestMinidumpUploaderImpl(getInstrumentation().getTargetContext(), permManager,
-                        false /* cleanOutMinidumps */);
+                new TestMinidumpUploaderImpl(getInstrumentation().getTargetContext(), permManager);
 
         File firstFile = createMinidumpFileInCrashDir("1_abc.dmp0");
         File secondFile = createMinidumpFileInCrashDir("12_abcd.dmp0");
@@ -231,7 +237,7 @@ public class MinidumpUploaderTest extends CrashTestCase {
 
     private static MinidumpUploaderImpl createCallableListMinidumpUploader(Context context,
             final List<MinidumpUploadCallableCreator> callables, final boolean userPermitted) {
-        return new MinidumpUploaderImpl(context, false /* cleanOutMinidumps */) {
+        return new TestMinidumpUploaderImpl(context, null) {
             private int mIndex = 0;
 
             @Override
@@ -359,8 +365,8 @@ public class MinidumpUploaderTest extends CrashTestCase {
                     { mIsEnabledForTests = true; }
                 };
         final CountDownLatch stopStallingLatch = new CountDownLatch(1);
-        MinidumpUploaderImpl minidumpUploader = new MinidumpUploaderImpl(
-                getInstrumentation().getTargetContext(), false /* cleanOutMinidumps */) {
+        MinidumpUploaderImpl minidumpUploader = new TestMinidumpUploaderImpl(
+                getInstrumentation().getTargetContext(), permManager) {
             @Override
             public MinidumpUploadCallable createMinidumpUploadCallable(
                     File minidumpFile, File logfile) {
@@ -469,13 +475,19 @@ public class MinidumpUploaderTest extends CrashTestCase {
      * CrashReportingPermissionManager.isUsageAndCrashReportingPermittedByUser().
      */
     private static class WebViewUserConsentMinidumpUploaderImpl extends MinidumpUploaderImpl {
-        boolean mUserConsent;
-        WebViewUserConsentMinidumpUploaderImpl(
-                Context context, boolean cleanOutMinidumps, boolean userConsent) {
-            super(context, cleanOutMinidumps);
+        private final boolean mUserConsent;
+        WebViewUserConsentMinidumpUploaderImpl(Context context, boolean userConsent) {
+            super(context);
             mUserConsent = userConsent;
         }
         @Override
+        public CrashFileManager createCrashFileManager(File crashDir) {
+            return new CrashFileManager(crashDir) {
+                @Override
+                public void cleanOutAllNonFreshMinidumpFiles() {}
+            };
+        }
+        @Override
         public PlatformServiceBridge createPlatformServiceBridge() {
             return new TestPlatformServiceBridge(true /* canUseGms */, mUserConsent);
         }
@@ -514,9 +526,8 @@ public class MinidumpUploaderTest extends CrashTestCase {
     }
 
     private void testPlatformServicesBridgeIsUsed(final boolean userConsent) throws IOException {
-        MinidumpUploader minidumpUploader =
-                new WebViewUserConsentMinidumpUploaderImpl(getInstrumentation().getTargetContext(),
-                        false /* cleanOutMinidumps */, userConsent);
+        MinidumpUploader minidumpUploader = new WebViewUserConsentMinidumpUploaderImpl(
+                getInstrumentation().getTargetContext(), userConsent);
 
         File firstFile = createMinidumpFileInCrashDir("1_abc.dmp0");
         File secondFile = createMinidumpFileInCrashDir("12_abcd.dmp0");
@@ -658,8 +669,7 @@ public class MinidumpUploaderTest extends CrashTestCase {
                     { mIsEnabledForTests = true; }
                 };
         MinidumpUploader minidumpUploader =
-                new TestMinidumpUploaderImpl(getInstrumentation().getTargetContext(), permManager,
-                        false /* cleanOutMinidumps */);
+                new TestMinidumpUploaderImpl(getInstrumentation().getTargetContext(), permManager);
 
         uploadMinidumpsSync(minidumpUploader, false /* expectReschedule */);
         // Ensure there are no minidumps left to upload.