[Merge to M58] [Android Crash Reporting] Simplify crash report upload code.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpDirectoryObserver.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpDirectoryObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpDirectoryObserver.java
index 5a389f71c7c3715b5e2b40ea51f0f1a118d19849..2be0e0023df1b8f97420002c3a2c9937b598af48 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpDirectoryObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpDirectoryObserver.java
@@ -5,51 +5,46 @@
 package org.chromium.chrome.browser.crash;
 
 import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
+import android.os.AsyncTask;
 import android.os.FileObserver;
 
 import org.chromium.base.ContextUtils;
-import org.chromium.base.Log;
-import org.chromium.base.PathUtils;
 import org.chromium.components.minidump_uploader.CrashFileManager;
 
 import java.io.File;
 
 /**
- * The FileObserver to monitor the minidump directory.
+ * The FileObserver that monitors the minidump directory for new crash records.
  */
 public class MinidumpDirectoryObserver extends FileObserver {
-    private static final String TAG = "MinidumpDirObserver";
+    /**
+     * A utility class to help manage the contents of the crash minidump local storage directory.
+     */
+    final CrashFileManager mFileManager;
 
     public MinidumpDirectoryObserver() {
+        this(new CrashFileManager(ContextUtils.getApplicationContext().getCacheDir()));
+    }
+
+    private MinidumpDirectoryObserver(CrashFileManager fileManager) {
         // The file observer detects MOVED_TO for child processes.
-        super(new File(PathUtils.getCacheDirectory(), CrashFileManager.CRASH_DUMP_DIR).toString(),
-                FileObserver.MOVED_TO);
+        super(fileManager.getCrashDirectory().toString(), FileObserver.MOVED_TO);
+        mFileManager = fileManager;
     }
 
     /**
-     *  When a minidump is detected, upload it to Google crash server
+     * When a minidump is detected, extract and append a logcat to it, then upload it to the crash
+     * server.
      */
     @Override
     public void onEvent(int event, String path) {
         // This is executed on a thread dedicated to FileObserver.
         if (CrashFileManager.isMinidumpMIMEFirstTry(path)) {
-            Context appContext = ContextUtils.getApplicationContext();
-            try {
-                Intent intent =
-                        MinidumpUploadService.createFindAndUploadLastCrashIntent(appContext);
-                appContext.startService(intent);
-                Log.i(TAG, "Detects a new minidump %s send intent to MinidumpUploadService", path);
-            } catch (SecurityException e) {
-                // For KitKat and below, there was a framework bug which cause us to not be able to
-                // find our own crash uploading service. Ignore a SecurityException here on older
-                // OS versions since the crash will eventually get uploaded on next start.
-                // crbug/542533
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    throw e;
-                }
-            }
+            // Note that the logcat extraction might fail. This is ok; in that case, the minidump
+            // will be found and uploaded upon the next browser launch.
+            Context context = ContextUtils.getApplicationContext();
+            File minidump = mFileManager.getCrashFile(path);
+            AsyncTask.THREAD_POOL_EXECUTOR.execute(new LogcatExtractionRunnable(context, minidump));
         }
     }
 }