Index: components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java |
diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java |
index 5eec37dbd14c765b8986964ec65ddb20f5d62703..b4729d6e1fe3fb4fff8e7536b67ca6eaac7aefac 100644 |
--- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java |
+++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java |
@@ -54,15 +54,13 @@ public class MinidumpUploadCallable implements Callable<Integer> { |
UPLOAD_SUCCESS, |
UPLOAD_FAILURE, |
UPLOAD_USER_DISABLED, |
- UPLOAD_COMMANDLINE_DISABLED, |
UPLOAD_DISABLED_BY_SAMPLING |
}) |
public @interface MinidumpUploadStatus {} |
public static final int UPLOAD_SUCCESS = 0; |
public static final int UPLOAD_FAILURE = 1; |
public static final int UPLOAD_USER_DISABLED = 2; |
- public static final int UPLOAD_COMMANDLINE_DISABLED = 3; |
- public static final int UPLOAD_DISABLED_BY_SAMPLING = 4; |
+ public static final int UPLOAD_DISABLED_BY_SAMPLING = 3; |
private final File mFileToUpload; |
private final File mLogfile; |
@@ -86,12 +84,6 @@ public class MinidumpUploadCallable implements Callable<Integer> { |
@Override |
public Integer call() { |
- // TODO(jchinlee): address proper cleanup procedures for command line flag-disabled uploads. |
- if (mPermManager.isCrashUploadDisabledByCommandLine()) { |
- Log.i(TAG, "Minidump upload is disabled by command line flag. Retaining file."); |
- return UPLOAD_COMMANDLINE_DISABLED; |
- } |
- |
if (mPermManager.isUploadEnabledForTests()) { |
Log.i(TAG, "Minidump upload enabled for tests, skipping other checks."); |
} else if (!CrashFileManager.isForcedUpload(mFileToUpload)) { |