[Crash Reporting] Fix a race between uploading and appending logcat data.

components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java

Index: components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java
diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java
index 9c26203b25be4ae4b58aad44ccafc60a49aa8fbc..fcda72e5fec629bce12ad59d9813e46a3b77111d 100644
--- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java
+++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java
@@ -96,7 +96,7 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
                 return;
             }
 
-            File[] minidumps = fileManager.getAllMinidumpFiles(MAX_UPLOAD_TRIES_ALLOWED);
+            File[] minidumps = fileManager.getMinidumpsReadyForUpload(MAX_UPLOAD_TRIES_ALLOWED);
 
             Log.i(TAG, "Attempting to upload %d minidumps.", minidumps.length);
             for (File minidump : minidumps) {
@@ -143,13 +143,20 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
                 }
             }
 
+            // Prior to M60, the ".tryN" suffix was optional for files ready to be uploaded; it is
+            // now required. Give clients a chance to migrate previously saved off minidumps to the
+            // new naming scheme, if necessary. Do this after attempting to upload existing crash
+            // dumps, to ensure that if the task is rescheduled, it has a chance to make progress on
+            // the most important task first.
+            mDelegate.migrateMinidumpFilenamesIfNeeded(fileManager);
+
             // Clean out old/uploaded minidumps. Note that this clean-up method is more strict than
             // our copying mechanism in the sense that it keeps fewer minidumps.
             fileManager.cleanOutAllNonFreshMinidumpFiles();
 
             // Reschedule if there are still minidumps to upload.
             boolean reschedule =
-                    fileManager.getAllMinidumpFiles(MAX_UPLOAD_TRIES_ALLOWED).length > 0;
+                    fileManager.getMinidumpsReadyForUpload(MAX_UPLOAD_TRIES_ALLOWED).length > 0;
             mUploadsFinishedCallback.uploadsFinished(reschedule);
         }
     }