Follow through when --force-dump-upload flag is set.

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 f7cf7124b9e029377a24d1e70e4eb7bd0dfd5dc4..71fa60ad45087d68ac56e572c93095417ddf133e 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
@@ -117,13 +117,15 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
         private final boolean mIsUserPermitted;
         private final boolean mIsCommandLineDisabled;
         private final boolean mIsLimited;
+        private final boolean mIsEnabledForTests;
 
-        MockCrashReportingPermissionManager(boolean isPermitted,
-                boolean isUserPermitted, boolean isCommandLineDisabled, boolean isLimited) {
+        MockCrashReportingPermissionManager(boolean isPermitted, boolean isUserPermitted,
+                boolean isCommandLineDisabled, boolean isLimited, boolean isEnabledForTests) {
             mIsPermitted = isPermitted;
             mIsUserPermitted = isUserPermitted;
             mIsCommandLineDisabled = isCommandLineDisabled;
             mIsLimited = isLimited;
+            mIsEnabledForTests = isEnabledForTests;
         }
 
         @Override
@@ -145,6 +147,11 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
         public boolean isUploadLimited() {
             return mIsLimited;
         }
+
+        @Override
+        public boolean isUploadEnabledForTests() {
+            return mIsEnabledForTests;
+        }
     }
 
     /**
@@ -188,7 +195,7 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
     @Feature({"Android-AppBase"})
     public void testCallWhenCurrentlyPermitted() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(true, true, false, false);
+                new MockCrashReportingPermissionManager(true, true, false, false, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new TestHttpURLConnectionFactory();
 
@@ -204,7 +211,7 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
     @Feature({"Android-AppBase"})
     public void testCallNotPermittedByUser() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(false, false, false, false);
+                new MockCrashReportingPermissionManager(false, false, false, false, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
 
@@ -219,7 +226,7 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
     @Feature({"Android-AppBase"})
     public void testCallNotPermittedByCommandLine() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(true, true, true, false);
+                new MockCrashReportingPermissionManager(true, true, true, false, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
 
@@ -234,7 +241,7 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
     @Feature({"Android-AppBase"})
     public void testCallPermittedButNotUnderCurrentCircumstances() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(false, true, false, false);
+                new MockCrashReportingPermissionManager(false, true, false, false, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
 
@@ -249,7 +256,7 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
     @Feature({"Android-AppBase"})
     public void testCrashUploadConstrainted() throws Exception {
         CrashReportingPermissionManager testPermManager =
-                new MockCrashReportingPermissionManager(true, true, false, true);
+                new MockCrashReportingPermissionManager(true, true, false, true, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new TestHttpURLConnectionFactory();
 
@@ -260,6 +267,22 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
         assertFalse(mExpectedFileAfterUpload.exists());
     }
 
+    @SmallTest
+    @Feature({"Android-AppBase"})
+    public void testCrashUploadEnabledForTestsDespiteConstraints() throws Exception {
+        CrashReportingPermissionManager testPermManager =
+                new MockCrashReportingPermissionManager(false, false, false, true, true);
+
+        HttpURLConnectionFactory httpURLConnectionFactory = new TestHttpURLConnectionFactory();
+
+        MinidumpUploadCallable minidumpUploadCallable =
+                new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
+        assertEquals(MinidumpUploadCallable.UPLOAD_SUCCESS,
+                minidumpUploadCallable.call().intValue());
+        assertTrue(mExpectedFileAfterUpload.exists());
+        assertValidUploadLogEntry();
+    }
+
     private void extendUploadFile(int numBytes) throws FileNotFoundException, IOException {
         FileOutputStream stream = null;
         try {