Move minidump renaming from MinidumpUploadService.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.crash;
 
 import android.app.IntentService;
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.StringDef;
@@ skipping 223 matching lines @@
         String logfileName = intent.getStringExtra(UPLOAD_LOG_KEY);
         File logfile = new File(logfileName);
 
         // Try to upload minidump
         MinidumpUploadCallable minidumpUploadCallable =
                 createMinidumpUploadCallable(minidumpFile, logfile);
         @MinidumpUploadCallable.MinidumpUploadStatus int uploadStatus =
                 minidumpUploadCallable.call();
 
         if (uploadStatus == MinidumpUploadCallable.UPLOAD_SUCCESS) {
+            CrashFileManager.markUploadSuccess(minidumpFile);
             // Only update UMA stats if an intended and successful upload.

[Ilya Sherman, 2016/10/31 19:48:13]

I'm a bit confused by this comment.  Do you know what it means?  (I know it's
unrelated to your CL -- just very near to the code you're modifying :-})

[gsennton, 2016/10/31 19:54:30]

IIUC we only have UMA stats for successful uploads, and for when we retry too
many times - I guess the comment is trying to imply that we don't update the UMA
stats unless we hit one of these two cases? (or at least the success-case).

             incrementCrashSuccessUploadCount(getNewNameAfterSuccessfulUpload(minidumpFileName));
+        } else if (uploadStatus == MinidumpUploadCallable.UPLOAD_USER_DISABLED
+                || uploadStatus == MinidumpUploadCallable.UPLOAD_DISABLED_BY_SAMPLING) {
+            Log.i(TAG, "Marking minidump as skipped for cleanup to prevent future uploads.");
+            CrashFileManager.markUploadSkipped(minidumpFile);
         } else if (uploadStatus == MinidumpUploadCallable.UPLOAD_FAILURE) {
             // Unable to upload minidump. Incrementing try number and restarting.
 
             // Only create another attempt if we have successfully renamed
             // the file.
             String newName = CrashFileManager.tryIncrementAttemptNumber(minidumpFile);
             if (newName != null) {
                 if (++tries < MAX_TRIES_ALLOWED) {
                     // TODO(nyquist): Do this as an exponential backoff.
                     MinidumpUploadRetry.scheduleRetry(getApplicationContext());
@@ skipping 141 matching lines @@
 
         // This method is intended to be used for manually triggering an attempt to upload an
         // already existing crash dump. Such a crash dump should already have had a chance to attach
         // the logcat to the minidump. Moreover, it's almost certainly too late to try to extract
         // the logcat now, since typically some time has passed between the crash and the user's
         // manual upload attempt.
         uploadIntent.putExtra(FINISHED_LOGCAT_EXTRACTION_KEY, true);
         startService(uploadIntent);
     }
 }