Move usage and crash reporting to opt-out by default.

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java

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 b9d0c13b194c561bc5a8d2b31086c9d95074837c..240b42b603b0c06889ddb1290a5d5c4b822b7deb 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
@@ -323,19 +323,10 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
     }
 
     /**
-     * Check whether crash dump upload preference is disabled according to corresponding preference.
+     * Check whether crash dump upload preference is set to allow uploads or is set to not allow
+     * uploads for any connection type.
      *
-     * @return boolean {@code true} if the option is set to not send.
-     */
-    public boolean isNeverUploadCrashDump() {
-        if (isCellularExperimentEnabled()) return !isUsageAndCrashReportingEnabled();
-        return !isUploadCrashDumpEnabled();
-    }
-
-    /**
-     * Check whether crash dump upload preference is set to NEVER only.
-     *
-     * @return boolean {@code true} if the option is set to NEVER.
+     * @return boolean {@code true} if the option is set to allow uploads.
      */
     public boolean isUploadCrashDumpEnabled() {
         if (isMobileNetworkCapable()) {
@@ -421,14 +412,11 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
      */
     @Override
     public boolean isUploadUserPermitted() {
+        // If user is in cellular experiment read new two-option prefs.
         if (isCellularExperimentEnabled()) return isUsageAndCrashReportingEnabled();
 
-        if (isMobileNetworkCapable()) {
-            String option =
-                    mSharedPreferences.getString(PREF_CRASH_DUMP_UPLOAD, mCrashDumpNeverUpload);
-            return option.equals(mCrashDumpAlwaysUpload) || option.equals(mCrashDumpWifiOnlyUpload);
-        }
-        return mSharedPreferences.getBoolean(PREF_CRASH_DUMP_UPLOAD_NO_CELLULAR, false);
+        // If user is not in cellular experiment read old three-option prefs.
+        return isUploadCrashDumpEnabled();
     }
 
     /**