| Index: chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
|
| index 76510e954c47d25b43ecf0c7bdba82746292d0a9..99c413b886f7d699353ee4a932044f6bfc55e063 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
|
| @@ -92,17 +92,21 @@ public class MinidumpUploadCallable implements Callable<Integer> {
|
| return UPLOAD_COMMANDLINE_DISABLED;
|
| }
|
|
|
| - if (!mPermManager.isUploadUserPermitted()) {
|
| - Log.i(TAG, "Minidump upload is not permitted by user. Marking file as uploaded for "
|
| - + "cleanup to prevent future uploads.");
|
| - cleanupMinidumpFile();
|
| - return UPLOAD_USER_DISABLED;
|
| - }
|
| + if (mPermManager.isUploadEnabledForTests()) {
|
| + Log.i(TAG, "Minidump upload enabled for tests, skipping other checks.");
|
| + } else {
|
| + if (!mPermManager.isUploadUserPermitted()) {
|
| + Log.i(TAG, "Minidump upload is not permitted by user. Marking file as uploaded for "
|
| + + "cleanup to prevent future uploads.");
|
| + cleanupMinidumpFile();
|
| + return UPLOAD_USER_DISABLED;
|
| + }
|
|
|
| - boolean isLimited = mPermManager.isUploadLimited();
|
| - if (isLimited || !mPermManager.isUploadPermitted()) {
|
| - Log.i(TAG, "Minidump cannot currently be uploaded due to constraints.");
|
| - return UPLOAD_FAILURE;
|
| + boolean isLimited = mPermManager.isUploadLimited();
|
| + if (isLimited || !mPermManager.isUploadPermitted()) {
|
| + Log.i(TAG, "Minidump cannot currently be uploaded due to constraints.");
|
| + return UPLOAD_FAILURE;
|
| + }
|
| }
|
|
|
| HttpURLConnection connection =
|
|
|