Move minidump renaming from MinidumpUploadService.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
index 71ee35f88f2de56ee5aa197be3362cbf1a01af54..c569c59f395364893efdf2b0ffb67b3e0dc4e7b0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
@@ -96,16 +96,12 @@ public class MinidumpUploadCallable implements Callable<Integer> {
             Log.i(TAG, "Minidump upload enabled for tests, skipping other checks.");
         } else if (!CrashFileManager.isForcedUpload(mFileToUpload)) {
             if (!mPermManager.isUsageAndCrashReportingPermittedByUser()) {
-                Log.i(TAG, "Minidump upload is not permitted by user. Marking file as skipped for "
-                                + "cleanup to prevent future uploads.");
-                CrashFileManager.markUploadSkipped(mFileToUpload);
+                Log.i(TAG, "Minidump upload is not permitted by user.");
                 return UPLOAD_USER_DISABLED;
             }
 
             if (!mPermManager.isClientInMetricsSample()) {
-                Log.i(TAG, "Minidump upload skipped due to sampling.  Marking file as skipped for "
-                                + "cleanup to prevent future uploads.");
-                CrashFileManager.markUploadSkipped(mFileToUpload);
+                Log.i(TAG, "Minidump upload skipped due to sampling.");
                 return UPLOAD_DISABLED_BY_SAMPLING;
             }
 
@@ -186,11 +182,6 @@ public class MinidumpUploadCallable implements Callable<Integer> {
             String id = responseContent != null ? responseContent : "unknown";
             Log.i(TAG, "Minidump " + mFileToUpload.getName() + " uploaded successfully, id: " + id);
 
-            // TODO(acleung): MinidumpUploadService is in charge of renaming while this class is
-            // in charge of deleting. We should move all the file system operations into
-            // MinidumpUploadService instead.
-            CrashFileManager.markUploadSuccess(mFileToUpload);
-
             try {
                 appendUploadedEntryToLog(id);
             } catch (IOException ioe) {