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 cc67d03db34b1e97576af014bacf33add19b263c..354f94ab7c76644d416a98e6110a7c28dfcfe2be 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
@@ -301,19 +301,9 @@ 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 NEVER only.

[Ilya Sherman, 2016/08/25 19:56:51]

Hmm, I don't really understand what "is set to NEVER only" means.  Could you
please rephrase this comment?

[gayane -on leave until 09-2017, 2016/08/25 20:50:15]

Done.

      *
-     * @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 not set to NEVER.
      */
     public boolean isUploadCrashDumpEnabled() {
         if (isMobileNetworkCapable()) {
@@ -402,12 +392,7 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
     public boolean isUploadUserPermitted() {
         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);
+        return isUploadCrashDumpEnabled();

[Ilya Sherman, 2016/08/25 19:56:51]

I'm confused by the changes here.  What is the distinction between
isUploadCrashDumpEnabled() and isUsageAndCrashReportingEnabled()?  What is the
purpose of this method, isUploadUserPermitted -- how does it differ from the
other two?

I *think* that the answers to my questions are: isUploadCrashDumpEnabled()
checks the old tri-state preference, isUsageAndCrashReportingEnabled() checks
the new bi-state preference, and isUploadUserPermitted() is a wrapper that
should always be used in place of the other two.  But, in that case, should the
other two be private?  Hopefully this will all get a lot clearer once you have a
chance to deprecate the tri-state preference, and we only have one preference to
worry about.

[gayane -on leave until 09-2017, 2016/08/25 20:50:15]

Yes, you got it right. I am about to remove a lot of code and deprecate
tri-state preferences. For now I will add a short comments. Also cannot simply
make these functions private as they are called from other places. But cleanup
is coming!

     }
 
     /**