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

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

Index: chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
index c220361df0c0079cd1b22f28ae6d215d16dbe2a7..39b875354b65ef4370066a850b9002fce5104ce6 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
@@ -45,7 +45,7 @@ public class FirstRunFlowSequencerTest {
     public static class TestFirstRunFlowSequencer extends FirstRunFlowSequencer {
         public Bundle returnedBundle;
         public boolean calledOnFlowIsKnown;
-        public boolean calledEnableCrashUpload;
+        public boolean calledSetDefaultUsageAndCrashReporting;
         public boolean calledSetFirstRunFlowSignInComplete;
 
         public boolean isFirstRunFlowComplete;
@@ -58,7 +58,7 @@ public class FirstRunFlowSequencerTest {
         public boolean shouldShowDataReductionPage;
 
         public TestFirstRunFlowSequencer(Activity activity, Bundle launcherProvidedProperties) {
-            super(activity, launcherProvidedProperties, true);
+            super(activity, launcherProvidedProperties);
         }
 
         @Override
@@ -108,8 +108,8 @@ public class FirstRunFlowSequencerTest {
         }
 
         @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
@@ -152,7 +152,7 @@ public class FirstRunFlowSequencerTest {
                 false); // hasChildAccount
         assertTrue(mSequencer.calledOnFlowIsKnown);
         assertNull(mSequencer.returnedBundle);
-        assertFalse(mSequencer.calledEnableCrashUpload);
+        assertFalse(mSequencer.calledSetDefaultUsageAndCrashReporting);
     }
 
     @Test
@@ -175,7 +175,7 @@ public class FirstRunFlowSequencerTest {
                 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);
     }
 
@@ -205,32 +205,7 @@ public class FirstRunFlowSequencerTest {
         assertEquals(DEFAULT_ACCOUNT, mSequencer.returnedBundle.getString(
                 AccountFirstRunFragment.FORCE_SIGNIN_ACCOUNT_TO));
         assertEquals(6, mSequencer.returnedBundle.size());
-        assertFalse(mSequencer.calledEnableCrashUpload);
-        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.calledSetDefaultUsageAndCrashReporting);
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
     }
 
@@ -260,7 +235,7 @@ public class FirstRunFlowSequencerTest {
         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);
     }
 
@@ -283,7 +258,7 @@ public class FirstRunFlowSequencerTest {
         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);
     }
 }