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

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
index da70c9e365de017276a632de783be584799e1f8d..6cce882d726edc50f50016d8f58f7c83b1215f70 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
@@ -18,10 +18,8 @@ import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeApplication;
-import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.EmbedContentViewActivity;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
-import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoUtils;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
@@ -57,6 +55,7 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
     public static final String RESULT_CLOSE_APP = "Close App";
     public static final String RESULT_SIGNIN_ACCOUNT_NAME = "ResultSignInTo";
     public static final String RESULT_SHOW_SIGNIN_SETTINGS = "ResultShowSignInSettings";
+    public static final boolean DEFAULT_USAGE_CRASH_REPORTING = true;

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

nit: "USAGE_CRASH" is very much confusing my brain.  WDYT of something like
"DEFAULT_METRICS_AND_CRASH_REPORTING"?

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

Done.

 
     // UMA constants.
     private static final String UMA_SIGNIN_CHOICE = "MobileFre.SignInChoice";
@@ -114,16 +113,6 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
         }
     }
 
-    /**
-     * Returns whether metrics reporting is currently opt-in. This is used to determine if the
-     * enable metrics reporting checkbox on first-run should be initially checked. Opt-in means it
-     * is not initially checked, opt-out means it is. This is not guaranteed to be correct outside
-     * of the first-run situation, as the default may change over time.
-     */
-    private static boolean isMetricsReportingOptIn() {
-        return ChromeVersionInfo.isStableBuild();
-    }
-
     // Activity:
 
     @Override
@@ -152,7 +141,7 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
 
         mProfileDataCache = new ProfileDataCache(FirstRunActivity.this, null);
         mProfileDataCache.setProfile(Profile.getLastUsedProfile());
-        new FirstRunFlowSequencer(this, mFreProperties, isMetricsReportingOptIn()) {
+        new FirstRunFlowSequencer(this, mFreProperties) {
             @Override
             public void onFlowIsKnown(Bundle freProperties) {
                 if (freProperties == null) {
@@ -344,14 +333,8 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
     }
 
     @Override
-    public boolean isNeverUploadCrashDump() {
-        return sGlue.isNeverUploadCrashDump(getApplicationContext());
-    }
-
-    @Override
     public void acceptTermsOfService(boolean allowCrashUpload) {
-        UmaUtils.recordMetricsReportingDefaultOptIn(isMetricsReportingOptIn());
-        sGlue.acceptTermsOfService(getApplicationContext(), allowCrashUpload);
+        sGlue.acceptTermsOfService(allowCrashUpload);
         FirstRunStatus.setSkipWelcomePage(FirstRunActivity.this, true);
         flushPersistentData();
         stopProgressionIfNotAcceptedTermsOfService();