Revert of Android: Remove GetApplicationContext part 2

chrome/android/java/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnable.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 android.content.Context;
 import android.os.Build;
 import android.util.Patterns;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.components.minidump_uploader.CrashFileManager;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collections;
@@ skipping 81 matching lines @@
             "android.hardware", "android.inputmethodservice", "android.location", "android.media",
             "android.mtp", "android.net", "android.nfc", "android.opengl", "android.os",
             "android.preference", "android.print", "android.printservice", "android.provider",
             "android.renderscript", "android.sax", "android.security", "android.service",
             "android.speech", "android.support", "android.system", "android.telecom",
             "android.telephony", "android.test", "android.text", "android.transition",
             "android.util", "android.view", "android.webkit", "android.widget", "com.android.",
             "dalvik.", "java.", "javax.", "org.apache.", "org.json.", "org.w3c.dom.", "org.xml.",
             "org.xmlpull."};
 
+    private final Context mContext;
     private final File mMinidumpFile;
 
     /**
+     * @param context The application context for accessing the cache directory and firing intents.
      * @param minidump The minidump file that needs logcat output to be attached.
      */
-    public LogcatExtractionRunnable(File minidump) {
+    public LogcatExtractionRunnable(Context context, File minidump) {
+        mContext = context;
         mMinidumpFile = minidump;
     }
 
     @Override
     public void run() {
         Log.i(TAG, "Trying to extract logcat for minidump %s.", mMinidumpFile.getName());
-        CrashFileManager fileManager =
-                new CrashFileManager(ContextUtils.getApplicationContext().getCacheDir());
+        CrashFileManager fileManager = new CrashFileManager(mContext.getCacheDir());
         File fileToUpload = mMinidumpFile;
         try {
             List<String> logcat = getElidedLogcat();
             fileToUpload = new MinidumpLogcatPrepender(fileManager, mMinidumpFile, logcat).run();
             Log.i(TAG, "Succeeded extracting logcat to %s.", fileToUpload.getName());
         } catch (IOException | InterruptedException e) {
             Log.w(TAG, e.toString());
         }
 
         // Regardless of success, initiate the upload. That way, even if there are errors augmenting
         // the minidump with logcat data, the service can still upload the unaugmented minidump.
         if (MinidumpUploadService.shouldUseJobSchedulerForUploads()) {
-            MinidumpUploadService.scheduleUploadJob();
+            MinidumpUploadService.scheduleUploadJob(mContext);
         } else {
             try {
-                MinidumpUploadService.tryUploadCrashDump(fileToUpload);
+                MinidumpUploadService.tryUploadCrashDump(mContext, fileToUpload);
             } catch (SecurityException e) {
                 // For KitKat and below, there was a framework bug which causes 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;
                 }
             }
         }
@@ skipping 177 matching lines @@
      * {@link #CONSOLE_ELISION}.
      *
      * @param original String potentially containing console messages.
      * @return String with elided console messages.
      */
     @VisibleForTesting
     protected static String elideConsole(String original) {
         return CONSOLE_MSG.matcher(original).replaceAll(CONSOLE_ELISION);
     }
 }