[Cleanup] Remove the ability to disable Crash Reporting from the command line.

components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.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.components.minidump_uploader;
 
 import android.content.SharedPreferences;
 import android.support.annotation.IntDef;
 
 import org.chromium.base.ContextUtils;
@@ skipping 36 matching lines @@
     @VisibleForTesting
     protected static final String CRASH_URL_STRING = "https://clients2.google.com/cr/report";
 
     @VisibleForTesting
     protected static final String CONTENT_TYPE_TMPL = "multipart/form-data; boundary=%s";
 
     @IntDef({
         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;
     private final HttpURLConnectionFactory mHttpURLConnectionFactory;
     private final CrashReportingPermissionManager mPermManager;
 
     public MinidumpUploadCallable(
             File fileToUpload, File logfile, CrashReportingPermissionManager permissionManager) {
         this(fileToUpload, logfile, new HttpURLConnectionFactoryImpl(), permissionManager);
         removeOutdatedPrefs(ContextUtils.getAppSharedPreferences());
     }
 
     public MinidumpUploadCallable(File fileToUpload, File logfile,
             HttpURLConnectionFactory httpURLConnectionFactory,
             CrashReportingPermissionManager permissionManager) {
         mFileToUpload = fileToUpload;
         mLogfile = logfile;
         mHttpURLConnectionFactory = httpURLConnectionFactory;
         mPermManager = permissionManager;
     }
 
     @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)) {
             if (!mPermManager.isUsageAndCrashReportingPermittedByUser()) {
                 Log.i(TAG, "Minidump upload is not permitted by user. Marking file as skipped for "
                                 + "cleanup to prevent future uploads.");
                 CrashFileManager.markUploadSkipped(mFileToUpload);
                 return UPLOAD_USER_DISABLED;
             }
 
@@ skipping 204 matching lines @@
     // TODO(gayane): Remove this function and unused prefs in M51. crbug.com/555022
     private void removeOutdatedPrefs(SharedPreferences sharedPreferences) {
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.remove(PREF_DAY_UPLOAD_COUNT)
                 .remove(PREF_LAST_UPLOAD_DAY)
                 .remove(PREF_LAST_UPLOAD_WEEK)
                 .remove(PREF_WEEK_UPLOAD_SIZE)
                 .apply();
     }
 }