[minidump uploader] Retries: only initiate uploads when on WiFi/Ethernet

chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java

Index: chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java
index 613a3a456c263c3d1b947ac05d5d325f6ca9248b..628b54f39c7e99773634063e519f9db212d7130f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java
@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
 import org.chromium.components.minidump_uploader.CrashFileManager;
 import org.chromium.components.minidump_uploader.MinidumpUploadCallable;
+import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -258,7 +259,8 @@ public class MinidumpUploadService extends IntentService {
             if (newName != null) {
                 if (++tries < MAX_TRIES_ALLOWED) {
                     // TODO(nyquist): Do this as an exponential backoff.
-                    MinidumpUploadRetry.scheduleRetry(getApplicationContext());
+                    MinidumpUploadRetry.scheduleRetry(
+                            getApplicationContext(), getCrashReportingPermissionManager());
                 } else {
                     // Only record failure to UMA after we have maxed out the allotted tries.
                     incrementCrashFailureUploadCount(newName);
@@ -271,6 +273,13 @@ public class MinidumpUploadService extends IntentService {
         }
     }
 
+    /**
+     * Get the permission manager, can be overridden for testing.
+     */
+    CrashReportingPermissionManager getCrashReportingPermissionManager() {
+        return PrivacyPreferencesManager.getInstance();
+    }
+
     private static String getNewNameAfterSuccessfulUpload(String fileName) {
         return fileName.replace("dmp", "up");
     }
@@ -342,7 +351,7 @@ public class MinidumpUploadService extends IntentService {
     @VisibleForTesting
     MinidumpUploadCallable createMinidumpUploadCallable(File minidumpFile, File logfile) {
         return new MinidumpUploadCallable(
-                minidumpFile, logfile, PrivacyPreferencesManager.getInstance());
+                minidumpFile, logfile, getCrashReportingPermissionManager());
     }
 
     /**