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

chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.firstrun;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ skipping 27 matching lines @@
     /** Information for Google OS account */
     private static final String GOOGLE_ACCOUNT_TYPE = "com.google";
     private static final String DEFAULT_ACCOUNT = "test@gmail.com";
 
     /**
      * Testing version of FirstRunFlowSequencer that allows us to override all needed checks.
      */
     public static class TestFirstRunFlowSequencer extends FirstRunFlowSequencer {
         public Bundle returnedBundle;
         public boolean calledOnFlowIsKnown;
-        public boolean calledEnableCrashUpload;
+        public boolean calledSetDefaultUsageAndCrashReporting;
         public boolean calledSetFirstRunFlowSignInComplete;
 
         public boolean isFirstRunFlowComplete;
         public boolean isSignedIn;
         public boolean isSyncAllowed;
         public Account[] googleAccounts;
         public boolean hasAnyUserSeenToS;
         public boolean shouldSkipFirstUseHints;
         public boolean isFirstRunEulaAccepted;
         public boolean shouldShowDataReductionPage;
 
         public TestFirstRunFlowSequencer(Activity activity, Bundle launcherProvidedProperties) {
-            super(activity, launcherProvidedProperties, true);
+            super(activity, launcherProvidedProperties);
         }
 
         @Override
         public void onFlowIsKnown(Bundle freProperties) {
             calledOnFlowIsKnown = true;
             returnedBundle = freProperties;
         }
 
         @Override
         public boolean isFirstRunFlowComplete() {
@@ skipping 29 matching lines @@
         public boolean isFirstRunEulaAccepted() {
             return isFirstRunEulaAccepted;
         }
 
         @Override
         public boolean shouldShowDataReductionPage() {
             return shouldShowDataReductionPage;
         }
 
         @Override
-        public void enableCrashUpload() {
-            calledEnableCrashUpload = true;
+        public void setDefaultUsageAndCrashReporting() {
+            calledSetDefaultUsageAndCrashReporting = true;
         }

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

It looks like there are no tests where this is called.  Is that intentional?

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

fixed the tests, should be call in all tests expect when isFirstRunFlowComplete
is true.

 
         @Override
         protected void setFirstRunFlowSignInComplete() {
             calledSetFirstRunFlowSignInComplete = true;
         }
     }
 
     ActivityController<Activity> mActivityController;
     TestFirstRunFlowSequencer mSequencer;
 
@@ skipping 21 matching lines @@
         mSequencer.isSyncAllowed = true;
         mSequencer.googleAccounts = null;
         mSequencer.hasAnyUserSeenToS = true;
         mSequencer.shouldSkipFirstUseHints = false;
         mSequencer.isFirstRunEulaAccepted = true;
         mSequencer.processFreEnvironment(
                 false, // androidEduDevice
                 false); // hasChildAccount
         assertTrue(mSequencer.calledOnFlowIsKnown);
         assertNull(mSequencer.returnedBundle);
-        assertFalse(mSequencer.calledEnableCrashUpload);
+        assertFalse(mSequencer.calledSetDefaultUsageAndCrashReporting);
     }
 
     @Test
     @Feature({"FirstRun"})
     public void testStandardFlowTosNotSeen() {
         mSequencer.isFirstRunFlowComplete = false;
         mSequencer.isSignedIn = false;
         mSequencer.isSyncAllowed = true;
         mSequencer.googleAccounts = new Account[0];
         mSequencer.hasAnyUserSeenToS = false;
         mSequencer.shouldSkipFirstUseHints = false;
         mSequencer.shouldShowDataReductionPage = false;
         mSequencer.processFreEnvironment(
                 false, // androidEduDevice
                 false); // hasChildAccount
         assertTrue(mSequencer.calledOnFlowIsKnown);
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
         assertFalse(mSequencer.returnedBundle.getBoolean(
                 FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
         assertFalse(mSequencer.returnedBundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertEquals(4, mSequencer.returnedBundle.size());
-        assertFalse(mSequencer.calledEnableCrashUpload);
+        assertFalse(mSequencer.calledSetDefaultUsageAndCrashReporting);
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
     }
 
     @Test
     @Feature({"FirstRun"})
     public void testStandardFlowTosSeenOneAccount() {
         Account[] accounts = new Account[1];
         accounts[0] = new Account(DEFAULT_ACCOUNT, GOOGLE_ACCOUNT_TYPE);
         mSequencer.isFirstRunFlowComplete = false;
         mSequencer.isSignedIn = false;
         mSequencer.isSyncAllowed = true;
         mSequencer.googleAccounts = accounts;
         mSequencer.hasAnyUserSeenToS = true;
         mSequencer.shouldSkipFirstUseHints = false;
         mSequencer.shouldShowDataReductionPage = false;
         mSequencer.processFreEnvironment(
                 false, // androidEduDevice
                 false); // hasChildAccount
         assertTrue(mSequencer.calledOnFlowIsKnown);
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
         assertFalse(mSequencer.returnedBundle.getBoolean(
                 FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
         assertFalse(mSequencer.returnedBundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertTrue(mSequencer.returnedBundle.getBoolean(
                 AccountFirstRunFragment.PRESELECT_BUT_ALLOW_TO_CHANGE));
         assertEquals(DEFAULT_ACCOUNT, mSequencer.returnedBundle.getString(
                 AccountFirstRunFragment.FORCE_SIGNIN_ACCOUNT_TO));
         assertEquals(6, mSequencer.returnedBundle.size());
-        assertFalse(mSequencer.calledEnableCrashUpload);
+        assertFalse(mSequencer.calledSetDefaultUsageAndCrashReporting);
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
     }
 
-    @Test
-    @Feature({"FirstRun"})
-    public void testStandardFlowNonStable() {
-        mSequencer.isFirstRunFlowComplete = false;
-        mSequencer.isSignedIn = false;
-        mSequencer.isSyncAllowed = true;
-        mSequencer.googleAccounts = new Account[0];
-        mSequencer.hasAnyUserSeenToS = false;
-        mSequencer.shouldSkipFirstUseHints = false;
-        mSequencer.mIsMetricsReportingOptIn = false;
-        mSequencer.shouldShowDataReductionPage = false;
-        mSequencer.processFreEnvironment(
-                false, // androidEduDevice
-                false); // hasChildAccount
-        assertTrue(mSequencer.calledOnFlowIsKnown);
-        assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
-        assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
-        assertFalse(mSequencer.returnedBundle.getBoolean(
-                FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
-        assertFalse(mSequencer.returnedBundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
-        assertEquals(4, mSequencer.returnedBundle.size());
-        assertTrue(mSequencer.calledEnableCrashUpload);
-        assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
-    }
-
     @Test
     @Feature({"FirstRun"})
     public void testStandardFlowOneChildAccount() {
         Account[] accounts = new Account[1];
         accounts[0] = new Account(DEFAULT_ACCOUNT, GOOGLE_ACCOUNT_TYPE);
         mSequencer.isFirstRunFlowComplete = false;
         mSequencer.isSignedIn = false;
         mSequencer.isSyncAllowed = true;
         mSequencer.googleAccounts = accounts;
         mSequencer.hasAnyUserSeenToS = false;
         mSequencer.shouldSkipFirstUseHints = false;
         mSequencer.shouldShowDataReductionPage = false;
         mSequencer.processFreEnvironment(
                 false, // androidEduDevice
                 true); // hasChildAccount
         assertTrue(mSequencer.calledOnFlowIsKnown);
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
         assertFalse(mSequencer.returnedBundle.getBoolean(
                 FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
         assertTrue(mSequencer.returnedBundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertFalse(mSequencer.returnedBundle.getBoolean(
                 AccountFirstRunFragment.PRESELECT_BUT_ALLOW_TO_CHANGE));
         assertEquals(DEFAULT_ACCOUNT, mSequencer.returnedBundle.getString(
                 AccountFirstRunFragment.FORCE_SIGNIN_ACCOUNT_TO));
         assertEquals(6, mSequencer.returnedBundle.size());
-        assertFalse(mSequencer.calledEnableCrashUpload);
+        assertFalse(mSequencer.calledSetDefaultUsageAndCrashReporting);
         assertTrue(mSequencer.calledSetFirstRunFlowSignInComplete);
     }
 
     @Test
     @Feature({"FirstRun"})
     public void testStandardFlowShowDataReductionPage() {
         mSequencer.isFirstRunFlowComplete = false;
         mSequencer.isSignedIn = false;
         mSequencer.isSyncAllowed = true;
         mSequencer.googleAccounts = new Account[0];
         mSequencer.hasAnyUserSeenToS = false;
         mSequencer.shouldSkipFirstUseHints = false;
         mSequencer.shouldShowDataReductionPage = true;
         mSequencer.processFreEnvironment(
                 false, // androidEduDevice
                 false); // hasChildAccount
         assertTrue(mSequencer.calledOnFlowIsKnown);
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
         assertTrue(mSequencer.returnedBundle.getBoolean(FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
         assertFalse(mSequencer.returnedBundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertEquals(4, mSequencer.returnedBundle.size());
-        assertFalse(mSequencer.calledEnableCrashUpload);
+        assertFalse(mSequencer.calledSetDefaultUsageAndCrashReporting);
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
     }
 }