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

android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java

 // Copyright 2012 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.android_webview;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
@@ skipping 30 matching lines @@
  * Wrapper for the steps needed to initialize the java and native sides of webview chromium.
  */
 public abstract class AwBrowserProcess {
     public static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "webview";
 
     private static final String TAG = "AwBrowserProcess";
     private static final String EXCLUSIVE_LOCK_FILE = "webview_data.lock";
     private static RandomAccessFile sLockFile;
     private static FileLock sExclusiveFileLock;
 
-    private static final int MAX_MINIDUMP_UPLOAD_TRIES = 3;
-
     /**
      * Loads the native library, and performs basic static construction of objects needed
      * to run webview in this process. Does not create threads; safe to call from zygote.
      * Note: it is up to the caller to ensure this is only called once.
      */
     public static void loadLibrary() {
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
         try {
             LibraryLoader libraryLoader = LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW);
             libraryLoader.loadNow();
@@ skipping 95 matching lines @@
      */
     public static void handleMinidumps(
             final String webViewPackageName, final boolean userApproved) {
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... params) {
                 final Context appContext = ContextUtils.getApplicationContext();
                 final File crashSpoolDir = new File(appContext.getCacheDir().getPath(), "WebView");
                 if (!crashSpoolDir.isDirectory()) return null;
                 final CrashFileManager crashFileManager = new CrashFileManager(crashSpoolDir);
-                final File[] minidumpFiles =
-                        crashFileManager.getAllMinidumpFiles(MAX_MINIDUMP_UPLOAD_TRIES);
+
+                // The lifecycle of a minidump in the app directory is very simple: foo.dmpNNNNN --
+                // where NNNNN is a Process ID (PID) -- gets created, and is either deleted or
+                // copied over to the shared crash directory for all WebView-using apps.
+                final File[] minidumpFiles = crashFileManager.getMinidumpsSansLogcat();
                 if (minidumpFiles.length == 0) return null;
 
                 // Delete the minidumps if the user doesn't allow crash data uploading.
                 if (!userApproved) {
                     for (File minidump : minidumpFiles) {
                         if (!minidump.delete()) {
                             Log.w(TAG, "Couldn't delete file " + minidump.getAbsolutePath());
                         }
                     }
                     return null;
@@ skipping 50 matching lines @@
                     public void onServiceDisconnected(ComponentName className) {}
                 };
                 if (!appContext.bindService(intent, connection, Context.BIND_AUTO_CREATE)) {
                     Log.w(TAG, "Could not bind to Minidump-copying Service " + intent);
                 }
                 return null;
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 }