| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
|
| index ed1a2e2cca31dad150cfb62bc66a95a1552909a0..f640e2ed0ac40ba40572b3a2746d87ae6af1a7f6 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
|
| @@ -365,8 +365,7 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
|
| @Override
|
| public boolean isUploadPermitted() {
|
| return !mCrashUploadingCommandLineDisabled && isNetworkAvailable()
|
| - && (allowUploadCrashDump() || CommandLine.getInstance().hasSwitch(
|
| - ChromeSwitches.FORCE_CRASH_DUMP_UPLOAD));
|
| + && (allowUploadCrashDump() || isUploadEnabledForTests());
|
| }
|
|
|
| /**
|
| @@ -452,4 +451,15 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
|
| int state = mSharedPreferences.getInt(PREF_PHYSICAL_WEB, PHYSICAL_WEB_ONBOARDING);
|
| return (state == PHYSICAL_WEB_ON);
|
| }
|
| +
|
| + /**
|
| + * Check whether the command line switch is used to force uploading if at all possible. Used by
|
| + * test devices to avoid UI manipulation.
|
| + *
|
| + * @return whether uploading should be enabled if at all possible.
|
| + */
|
| + @Override
|
| + public boolean isUploadEnabledForTests() {
|
| + return CommandLine.getInstance().hasSwitch(ChromeSwitches.FORCE_CRASH_DUMP_UPLOAD);
|
| + }
|
| }
|
|
|