Revert of Android: Remove GetApplicationContext part 2

android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java

 // Copyright 2016 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.crash;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.webkit.ValueCallback;
 
 import org.chromium.android_webview.PlatformServiceBridge;
 import org.chromium.android_webview.command_line.CommandLineUtil;
 import org.chromium.base.CommandLine;
-import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.components.minidump_uploader.MinidumpUploaderDelegate;
 import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;
 import org.chromium.components.minidump_uploader.util.NetworkPermissionUtil;
 
 import java.io.File;
 
 /**
  * Android Webview-specific implementations for minidump uploading logic.
  */
 public class AwMinidumpUploaderDelegate implements MinidumpUploaderDelegate {
+    private final Context mContext;
     private final ConnectivityManager mConnectivityManager;
 
     private boolean mPermittedByUser = false;
 
     @VisibleForTesting
-    public AwMinidumpUploaderDelegate() {
+    public AwMinidumpUploaderDelegate(Context context) {
+        mContext = context;
         mConnectivityManager =
-                (ConnectivityManager) ContextUtils.getApplicationContext().getSystemService(
-                        Context.CONNECTIVITY_SERVICE);
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
     }
 
     @Override
     public File getCrashParentDir() {
-        return CrashReceiverService.getOrCreateWebViewCrashDir();
+        return CrashReceiverService.createWebViewCrashDir(mContext);
     }
 
     @Override
     public CrashReportingPermissionManager createCrashReportingPermissionManager() {
         return new CrashReportingPermissionManager() {
             @Override
             public boolean isClientInMetricsSample() {
                 // We will check whether the client is in the metrics sample before
                 // generating a minidump - so if no minidump is generated this code will
                 // never run and we don't need to check whether we are in the sample.
@@ skipping 18 matching lines @@
                 // on the main thread, but before the current worker thread started - so this thread
                 // will have seen the initialization of the CommandLine.
                 return CommandLine.getInstance().hasSwitch(
                         CommandLineUtil.CRASH_UPLOADS_ENABLED_FOR_TESTING_SWITCH);
             }
         };
     }
 
     @Override
     public void prepareToUploadMinidumps(final Runnable startUploads) {
-        PlatformServiceBridge.getOrCreateInstance().queryMetricsSetting(
+        PlatformServiceBridge.getOrCreateInstance(mContext).queryMetricsSetting(
                 new ValueCallback<Boolean>() {
                     public void onReceiveValue(Boolean enabled) {
                         ThreadUtils.assertOnUiThread();
                         mPermittedByUser = enabled;
                         startUploads.run();
                     }
                 });
     }
 
     @Override
     public void recordUploadSuccess(File minidump) {}
 
     @Override
     public void recordUploadFailure(File minidump) {}
 }