Split MinidumpUploadService into core- and Chrome-implementation.

chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
index ef017e7f9da037f524bff7f56a48a6f764a2c908..18db8116b75a4e81a7af13d5aae6f1da46fc9250 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
@@ -4,21 +4,24 @@
 
 package org.chromium.chrome.browser.crash;
 
-import static org.chromium.chrome.browser.crash.MinidumpUploadService.BROWSER;
-import static org.chromium.chrome.browser.crash.MinidumpUploadService.GPU;
-import static org.chromium.chrome.browser.crash.MinidumpUploadService.OTHER;
-import static org.chromium.chrome.browser.crash.MinidumpUploadService.RENDERER;
+import static org.chromium.components.minidump_uploader.util.MinidumpUploadDelegate.BROWSER;
+import static org.chromium.components.minidump_uploader.util.MinidumpUploadDelegate.GPU;
+import static org.chromium.components.minidump_uploader.util.MinidumpUploadDelegate.OTHER;
+import static org.chromium.components.minidump_uploader.util.MinidumpUploadDelegate.RENDERER;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
+import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;
+import org.chromium.components.minidump_uploader.util.MinidumpUploadDelegate;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.net.NetworkChangeNotifier;
@@ -37,6 +40,13 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
     private static final int MAX_TIMEOUT_MS = 20000;
     private static final String BOUNDARY = "TESTBOUNDARY";
 
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        MinidumpUploadService.setUploadDelegate(new TestMinidumpUploadDelegate());
+    }
+
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testFindAndUploadLastCrash() throws IOException {
@@ -75,6 +85,32 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
         assertEquals("Should have called startService() once", 1, numServiceStarts.intValue());
     }
 
+    private static class TestMinidumpUploadDelegate implements MinidumpUploadDelegate {
+        @Override
+        public void onSuccessfulUpload(Context context, @ProcessType String crashType) {}
+
+        @Override
+        public void onMaxedOutUploadFailures(Context context, @ProcessType String crashType) {
+            MoreAsserts.assertNotEqual(crashType, MinidumpUploadDelegate.OTHER);
+        }
+
+        @Override
+        public CrashReportingPermissionManager getCrashReportingPermissionManager() {
+            return new MinidumpUploadCallableTest.MockCrashReportingPermissionManager() {
+                {
+                    // None of the tests in this class depend on the values in the permission
+                    // manager - so set the values to false.
+                    mIsInSample = false;
+                    mIsNetworkAvailable = false;
+                    mIsPermitted = false;
+                    mIsUserPermitted = false;
+                    mIsCommandLineDisabled = false;
+                    mIsEnabledForTests = false;
+                }
+            };
+        }
+    }
+
     private static class TestMinidumpUploadService extends MinidumpUploadService {
         private TestMinidumpUploadService() {}
         private TestMinidumpUploadService(Context context) {
@@ -313,7 +349,7 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
         File minidumpFile = new File(mCrashDir, "chromium_renderer-111.dmp1");
         minidumpFile.createNewFile();
         File logfile = new File(mCrashDir, CrashFileManager.CRASH_DUMP_LOGFILE);
-        setUpMinidumpFile(minidumpFile, BOUNDARY);
+        setUpMinidumpFile(minidumpFile, BOUNDARY, "renderer");
 
         // Run test.
         Intent uploadIntent =