[Android] Provide an API for manually triggering a crash report upload.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/crash/CrashFileManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/CrashFileManager.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/CrashFileManager.java
index 922ec5cee4026ec0c205408ea6bf1342e312b018..55a9a094829d59b71c94119fc1f8eb8d37f23035 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/crash/CrashFileManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/crash/CrashFileManager.java
@@ -45,10 +45,14 @@ public class CrashFileManager {
 
     private static final Pattern UPLOADED_MINIDUMP_PATTERN = Pattern.compile("\\.up([0-9]*)\\z");
 
+    private static final String NOT_YET_UPLOADED_MINIDUMP_SUFFIX = ".dmp";
+
     private static final String UPLOADED_MINIDUMP_SUFFIX = ".up";
 
     private static final String UPLOAD_SKIPPED_MINIDUMP_SUFFIX = ".skipped";
 
+    private static final String UPLOAD_FORCED_MINIDUMP_SUFFIX = ".forced";
+
     private static final String UPLOAD_ATTEMPT_DELIMITER = ".try";
 
     @VisibleForTesting
@@ -116,13 +120,51 @@ public class CrashFileManager {
         int numTried = readAttemptNumber(filename);
         if (numTried > 0) {
             int newCount = numTried + 1;
-            return filename.replaceAll(UPLOAD_ATTEMPT_DELIMITER + numTried,
-                    UPLOAD_ATTEMPT_DELIMITER + newCount);
+            return filename.replace(
+                    UPLOAD_ATTEMPT_DELIMITER + numTried, UPLOAD_ATTEMPT_DELIMITER + newCount);
         } else {
             return filename + UPLOAD_ATTEMPT_DELIMITER + "1";
         }
     }
 
+    /**
+     * Attempts to rename the given file to clear any state from previous upload attempts,

[gayane -on leave until 09-2017, 2016/09/06 17:00:00]

The comment needs an update

[Ilya Sherman, 2016/09/07 00:54:01]

Done.

+     * essentially treating as a fresh minidump file. This is useful for manually initiating
+     * previously skipped uploads.
+     *
+     * @return The renamed file, or null if renaming failed.
+     */
+    public static File trySetForcedUpload(File fileToUpload) {
+        if (fileToUpload.getName().contains(UPLOADED_MINIDUMP_SUFFIX)) {
+            Log.w(TAG, "Refusing to reset upload attempt state for a file that has already been "
+                            + "successfully uploaded: " + fileToUpload.getName());
+            return null;
+        }
+        File renamedFile = new File(filenameWithForcedUploadState(fileToUpload.getPath()));
+        return fileToUpload.renameTo(renamedFile) ? renamedFile : null;
+    }
+
+    /**
+     * @return True iff the provided File was manually forced (by the user) to be uploaded.
+     */
+    public static boolean isForcedUpload(File fileToUpload) {
+        return fileToUpload.getName().contains(UPLOAD_FORCED_MINIDUMP_SUFFIX);
+    }
+
+    /**
+     * @return The filename to rename to so as to clear any upload attempt history.
+     */
+    @VisibleForTesting
+    protected static String filenameWithForcedUploadState(String filename) {
+        int numTried = readAttemptNumber(filename);
+        if (numTried > 0) {
+            filename = filename.replace(
+                    UPLOAD_ATTEMPT_DELIMITER + numTried, UPLOAD_ATTEMPT_DELIMITER + 0);
+        }
+        filename = filename.replace(UPLOAD_SKIPPED_MINIDUMP_SUFFIX, UPLOAD_FORCED_MINIDUMP_SUFFIX);
+        return filename.replace(NOT_YET_UPLOADED_MINIDUMP_SUFFIX, UPLOAD_FORCED_MINIDUMP_SUFFIX);
+    }
+
     @VisibleForTesting
     public static int readAttemptNumber(String filename) {
         int tryIndex = filename.lastIndexOf(UPLOAD_ATTEMPT_DELIMITER);
@@ -171,8 +213,11 @@ public class CrashFileManager {
      * immediately.
      */
     private static void renameCrashDumpFollowingUpload(File crashDumpFile, String suffix) {
-        boolean renamed = crashDumpFile.renameTo(
-                new File(crashDumpFile.getPath().replaceAll("\\.dmp", suffix)));
+        // The pre-upload filename might have been either "foo.dmpN.tryM" or "foo.forcedN.tryM".
+        String newName = crashDumpFile.getPath()
+                                 .replace(NOT_YET_UPLOADED_MINIDUMP_SUFFIX, suffix)
+                                 .replace(UPLOAD_FORCED_MINIDUMP_SUFFIX, suffix);
+        boolean renamed = crashDumpFile.renameTo(new File(newName));
         if (!renamed) {
             Log.w(TAG, "Failed to rename " + crashDumpFile);
             if (!crashDumpFile.delete()) {
@@ -312,6 +357,31 @@ public class CrashFileManager {
         return new File(getCrashDirectory(), filename);
     }
 
+    /**
+     * Returns the minidump file with the given local ID, or null if no previously minidump file has
+     * the given ID.
+     * NOTE: Crash files that have already been successfully uploaded are not included.
+     *
+     * @param localId The local ID of the crash report.
+     * @return The matching File, or null if no matching file is found.
+     */
+    File getCrashFileWithLocalId(String localId) {
+        for (File f : getAllFilesSorted()) {
+            // Only match non-uploaded or previously skipped files.
+            if (!f.getName().contains(NOT_YET_UPLOADED_MINIDUMP_SUFFIX)
+                    && !f.getName().contains(UPLOAD_SKIPPED_MINIDUMP_SUFFIX)
+                    && !f.getName().contains(UPLOAD_FORCED_MINIDUMP_SUFFIX)) {
+                continue;
+            }
+
+            String filenameSansExtension = f.getName().split("\\.")[0];
+            if (filenameSansExtension.endsWith(localId)) {
+                return f;
+            }
+        }
+        return null;
+    }
+
     File getCrashUploadLogFile() {
         return new File(getCrashDirectory(), CRASH_DUMP_LOGFILE);
     }