[Android] Do not immediately delete skipped crash dump uploads.

chrome/android/java/src/org/chromium/chrome/browser/crash/CrashFileManager.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 org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 
 import java.io.File;
@@ skipping 25 matching lines @@
     private static final Pattern MINIDUMP_MIME_FIRST_TRY_PATTERN =
             Pattern.compile("\\.dmp([0-9]+)$\\z");
 
     private static final Pattern MINIDUMP_PATTERN =
             Pattern.compile("\\.dmp([0-9]*)(\\.try[0-9])?\\z");
 
     private static final Pattern UPLOADED_MINIDUMP_PATTERN = Pattern.compile("\\.up([0-9]*)\\z");
 
     private static final String UPLOADED_MINIDUMP_SUFFIX = ".up";
 
+    private static final String UPLOAD_SKIPPED_MINIDUMP_SUFFIX = ".skipped";
+
     private static final String UPLOAD_ATTEMPT_DELIMITER = ".try";
 
     @VisibleForTesting
     protected static final String TMP_SUFFIX = ".tmp";
 
     private static final Pattern TMP_PATTERN = Pattern.compile("\\.tmp\\z");
 
     /**
      * Comparator used for sorting files by modification
      * Note that the behavior is undecided if the files are created at the same time
@@ skipping 63 matching lines @@
                 try {
                     return Integer.parseInt(numTriesString);
                 } catch (NumberFormatException ignored) {
                     return 0;
                 }
             }
         }
         return 0;
     }
 
-    public static boolean tryMarkAsUploaded(File mFileToUpload) {
-        return mFileToUpload.renameTo(
-                new File(mFileToUpload.getPath().replaceAll(
-                        "\\.dmp", UPLOADED_MINIDUMP_SUFFIX)));
+    /**
+     * Marks a crash dump file as successfully uploaded, by renaming the file.
+     *
+     * Does not immediately delete the file, for testing reasons. However, if renaming fails,
+     * attempts to delete the file immediately.
+     */
+    public static void markUploadSuccess(File crashDumpFile) {
+        CrashFileManager.renameCrashDumpFollowingUpload(crashDumpFile, UPLOADED_MINIDUMP_SUFFIX);
+    }
+
+    /**
+     * Marks a crash dump file's upload being skipped. An upload might be skipped due to lack of
+     * user consent, or due to this client being excluded from the sample of clients reporting
+     * crashes.
+     *
+     * Renames the file rather than deleting it, so that the user can manually upload the file later
+     * (via chrome://crashes). However, if renaming fails, attempts to delete the file immediately.
+     */
+    public static void markUploadSkipped(File crashDumpFile) {
+        CrashFileManager.renameCrashDumpFollowingUpload(
+                crashDumpFile, UPLOAD_SKIPPED_MINIDUMP_SUFFIX);
+    }
+
+    /**
+     * Renames a crash dump file. However, if renaming fails, attempts to delete the file
+     * immediately.
+     */
+    private static void renameCrashDumpFollowingUpload(File crashDumpFile, String suffix) {
+        boolean renamed = crashDumpFile.renameTo(
+                new File(crashDumpFile.getPath().replaceAll("\\.dmp", suffix)));
+        if (!renamed) {
+            Log.w(TAG, "Failed to rename " + crashDumpFile);
+            if (!crashDumpFile.delete()) {
+                Log.w(TAG, "Failed to delete " + crashDumpFile);
+            }
+        }
     }
 
     private final File mCacheDir;
 
     public CrashFileManager(File cacheDir) {
         if (cacheDir == null) {
             throw new NullPointerException("Specified context cannot be null.");
         } else if (!cacheDir.isDirectory()) {
             throw new IllegalArgumentException(cacheDir.getAbsolutePath()
                     + " is not a directory.");
@@ skipping 73 matching lines @@
     }
 
     File getCrashUploadLogFile() {
         return new File(mCacheDir, CRASH_DUMP_LOGFILE);
     }
 
     private File[] getAllTempFiles() {
         return getMatchingFiles(TMP_PATTERN);
     }
 }