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

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

 // Copyright 2015 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.chrome.browser.crash;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
@@ skipping 99 matching lines @@
             return null;
         }
     }
 
     private static class MockCrashReportingPermissionManager
             implements CrashReportingPermissionManager {
         private final boolean mIsPermitted;
         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
         public boolean isUploadPermitted() {
             return mIsPermitted;
         }
 
         @Override
         public boolean isUploadUserPermitted() {
             return mIsUserPermitted;
         }
 
         @Override
         public boolean isUploadCommandLineDisabled() {
             return mIsCommandLineDisabled;
         }
 
         @Override
         public boolean isUploadLimited() {
             return mIsLimited;
         }
+
+        @Override
+        public boolean isUploadEnabledForTests() {
+            return mIsEnabledForTests;
+        }
     }
 
     /**
      * This class calls |getInstrumentation| which cannot be done in a static context.
      */
     private class MockMinidumpUploadCallable extends MinidumpUploadCallable {
         MockMinidumpUploadCallable(
                 HttpURLConnectionFactory httpURLConnectionFactory,
                 CrashReportingPermissionManager permManager) {
             super(mTestUpload, mUploadLog, httpURLConnectionFactory, permManager);
@@ skipping 23 matching lines @@
     @Override
     protected void tearDown() throws Exception {
         if (mTestUpload.exists()) mTestUpload.delete();
         super.tearDown();
     }
 
     @SmallTest
     @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();
 
         MinidumpUploadCallable minidumpUploadCallable =
                 new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
         assertEquals(MinidumpUploadCallable.UPLOAD_SUCCESS,
                 minidumpUploadCallable.call().intValue());
         assertTrue(mExpectedFileAfterUpload.exists());
         assertValidUploadLogEntry();
     }
 
     @SmallTest
     @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();
 
         MinidumpUploadCallable minidumpUploadCallable =
                 new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
         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);
+                new MockCrashReportingPermissionManager(true, true, true, false, 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, false);
+                new MockCrashReportingPermissionManager(false, true, false, false, false);
 
         HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
 
         MinidumpUploadCallable minidumpUploadCallable =
                 new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
         assertEquals(MinidumpUploadCallable.UPLOAD_FAILURE,
                 minidumpUploadCallable.call().intValue());
         assertFalse(mExpectedFileAfterUpload.exists());
     }
 
     @SmallTest
     @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();
 
         MinidumpUploadCallable minidumpUploadCallable =
                 new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
         assertEquals(MinidumpUploadCallable.UPLOAD_FAILURE,
                 minidumpUploadCallable.call().intValue());
         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 {
             stream = new FileOutputStream(mTestUpload, true);
             byte[] buf = new byte[numBytes];
             stream.write(buf);
             stream.flush();
         } finally {
             if (stream != null) stream.close();
         }
@@ skipping 17 matching lines @@
 
         // Sanity check on the time stamp (within an hour).
         // Chances are the write and the check should have less than 1 second in between.
         assertTrue(time <= now);
         assertTrue(time > now - 60 * 60);
 
         String id = lastEntry.substring(seperator + 1, lastEntry.length());
         assertEquals(id, CRASH_ID);
     }
 }