[Android WebView] Ensure we have user consent before uploading minidumps

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

Index: android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
diff --git a/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java b/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
index 7d9ed3265dec59ad2410771dddd33bc2d5b091fc..d1e5d614a70c11f78ad984c1f5154492d821dde4 100644
--- a/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
+++ b/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
@@ -6,6 +6,7 @@ package org.chromium.android_webview.crash;
 
 import android.content.Context;
 
+import org.chromium.android_webview.command_line.CommandLineUtil;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.components.minidump_uploader.CrashFileManager;
@@ -105,14 +106,14 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
             }
             @Override
             public boolean isUsageAndCrashReportingPermittedByUser() {
-                // TODO(gsennton): make this depend on Android Checkbox when we can read that
-                // through GmsCore.
-                return false;
+                // We ensure we have user permission before starting to upload minidumps - so always
+                // return true here.
+                return true;
             }
             @Override
             public boolean isUploadEnabledForTests() {
-                return SynchronizedWebViewCommandLine.hasSwitch(
-                        CrashReceiverService.CRASH_UPLOADS_ENABLED_FOR_TESTING_SWITCH);
+                return SynchronizedWebViewCommandLine.getInstance().hasSwitch(
+                        CommandLineUtil.CRASH_UPLOADS_ENABLED_FOR_TESTING_SWITCH);
             }
         };
     }
@@ -165,7 +166,7 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
 
     @Override
     public void uploadAllMinidumps(
-            MinidumpUploader.UploadsFinishedCallback uploadsFinishedCallback) {
+            final MinidumpUploader.UploadsFinishedCallback uploadsFinishedCallback) {
         if (mWorkerThread != null) {
             throw new RuntimeException("Only one upload-job should be active at a time");
         }