Separate out experimental flag behavior.

chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadCallableTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadCallableTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadCallableTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadCallableTest.java
index 818b2abca0c246a2e291529d2ed3aa6fdd2a60b3..f7cf7124b9e029377a24d1e70e4eb7bd0dfd5dc4 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadCallableTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadCallableTest.java
@@ -115,12 +115,14 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
             implements CrashReportingPermissionManager {
         private final boolean mIsPermitted;
         private final boolean mIsUserPermitted;
+        private final boolean mIsCommandLineDisabled;
         private final boolean mIsLimited;
 
         MockCrashReportingPermissionManager(boolean isPermitted,
-                boolean isUserPermitted, boolean isLimited) {
+                boolean isUserPermitted, boolean isCommandLineDisabled, boolean isLimited) {
             mIsPermitted = isPermitted;
             mIsUserPermitted = isUserPermitted;
+            mIsCommandLineDisabled = isCommandLineDisabled;
             mIsLimited = isLimited;
         }
 
@@ -135,6 +137,11 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
         }
 
         @Override
+        public boolean isUploadCommandLineDisabled() {
+            return mIsCommandLineDisabled;
+        }
+
+        @Override
         public boolean isUploadLimited() {
             return mIsLimited;
         }
@@ -181,7 +188,7 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
     @Feature({"Android-AppBase"})
     public void testCallWhenCurrentlyPermitted() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(true, true, false);
+                new MockCrashReportingPermissionManager(true, true, false, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new TestHttpURLConnectionFactory();
 
@@ -197,22 +204,37 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
     @Feature({"Android-AppBase"})
     public void testCallNotPermittedByUser() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(false, false, false);
+                new MockCrashReportingPermissionManager(false, false, false, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
 
         MinidumpUploadCallable minidumpUploadCallable =
                 new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
-        assertEquals(MinidumpUploadCallable.UPLOAD_DISABLED,
+        assertEquals(MinidumpUploadCallable.UPLOAD_USER_DISABLED,
                 minidumpUploadCallable.call().intValue());
         assertTrue(mExpectedFileAfterUpload.exists());
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
+    public void testCallNotPermittedByCommandLine() throws Exception {
+        CrashReportingPermissionManager testPermManager =
+                new MockCrashReportingPermissionManager(true, true, true, false);
+
+        HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
+
+        MinidumpUploadCallable minidumpUploadCallable =
+                new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
+        assertEquals(MinidumpUploadCallable.UPLOAD_COMMANDLINE_DISABLED,
+                minidumpUploadCallable.call().intValue());
+        assertFalse(mExpectedFileAfterUpload.exists());
+    }
+
+    @SmallTest
+    @Feature({"Android-AppBase"})
     public void testCallPermittedButNotUnderCurrentCircumstances() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(false, true, false);
+                new MockCrashReportingPermissionManager(false, true, false, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
 
@@ -227,7 +249,7 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
     @Feature({"Android-AppBase"})
     public void testCrashUploadConstrainted() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(true, true, true);
+                new MockCrashReportingPermissionManager(true, true, false, true);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new TestHttpURLConnectionFactory();