Enabling sampling of UMA and crash reports on Android.

chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java

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 d21a02a6553a98b47f7835c725a31586d9081a56..bb0d01e499b892d8b9efaf27fde7321cef555ccf 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
@@ -52,17 +52,14 @@ public class MinidumpUploadCallable implements Callable<Integer> {
     @VisibleForTesting
     protected static final String CONTENT_TYPE_TMPL = "multipart/form-data; boundary=%s";
 
-    @IntDef({
-        UPLOAD_SUCCESS,
-        UPLOAD_FAILURE,
-        UPLOAD_USER_DISABLED,
-        UPLOAD_COMMANDLINE_DISABLED
-    })
+    @IntDef({UPLOAD_SUCCESS, UPLOAD_FAILURE, UPLOAD_USER_DISABLED, UPLOAD_COMMANDLINE_DISABLED,
+            UPLOAD_DISABLED_BY_SAMPLING})

[Ilya Sherman, 2016/08/24 05:02:50]

Could you please revert the format change here?  Or is this the "correct"
formatting?  The previous one was certainly more scannable.

[jwd, 2016/08/24 15:06:28]

Yeah, it's the result of git cl format. I reverted it once, because I prefered
the manual version, but I didn't want to keep fighting with the formatter.

     public @interface MinidumpUploadStatus {}
     public static final int UPLOAD_SUCCESS = 0;
     public static final int UPLOAD_FAILURE = 1;
     public static final int UPLOAD_USER_DISABLED = 2;
     public static final int UPLOAD_COMMANDLINE_DISABLED = 3;
+    public static final int UPLOAD_DISABLED_BY_SAMPLING = 4;
 
     private final File mFileToUpload;
     private final File mLogfile;
@@ -102,6 +99,11 @@ public class MinidumpUploadCallable implements Callable<Integer> {
                 return UPLOAD_USER_DISABLED;
             }
 
+            if (!mPermManager.isClientInMetricsSample()) {
+                Log.i(TAG, "Minidump cannot be uploaded due to sampling.");

[Ilya Sherman, 2016/08/24 05:02:50]

nit: This is super nitpicky, but I'd log something more like "Minidump upload
skipped due to sampling.  Marking file as uploaded for cleanup to prevent future
uploads."

That second sentence should be modified according to what we actually do with
the file.

[jwd, 2016/08/24 15:06:28]

Done.

+                return UPLOAD_DISABLED_BY_SAMPLING;
+            }
+
             boolean isLimited = mPermManager.isUploadLimited();
             if (isLimited || !mPermManager.isUploadPermitted()) {
                 Log.i(TAG, "Minidump cannot currently be uploaded due to constraints.");