Navi: Update default variant we intend to launch with.

Bug: 936624
Change-Id: Ifa7b57212f6de0346b5523ed6795f65d21b6e12d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1493374
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637573}

chrome/browser/ui/webui/welcome/nux/constants.cc

@@ -16,10 +16,10 @@ const base::Feature kNuxOnboardingFeature{"NuxOnboarding",
 // chrome/browser/resources/welcome/onboarding_welcome/welcome_app.js
 const base::FeatureParam<std::string> kNuxOnboardingNewUserModules{
     &kNuxOnboardingFeature, "new-user-modules",
-    "nux-email,nux-google-apps,nux-set-as-default,signin-view"};
+    "nux-google-apps,nux-email,nux-set-as-default,signin-view"};
 const base::FeatureParam<std::string> kNuxOnboardingReturningUserModules{
     &kNuxOnboardingFeature, "returning-user-modules", "nux-set-as-default"};
 const base::FeatureParam<bool> kNuxOnboardingShowEmailInterstitial{
-    &kNuxOnboardingFeature, "show-email-interstitial", true};
+    &kNuxOnboardingFeature, "show-email-interstitial", false};
 
 }  // namespace nux

chrome/browser/ui/webui/welcome/nux_helper.cc

@@ -32,12 +32,13 @@ const base::Feature kNuxOnboardingForceEnabled = {
 // chrome/browser/resources/welcome/onboarding_welcome/welcome_app.js
 const base::FeatureParam<std::string> kNuxOnboardingForceEnabledNewUserModules =
     {&kNuxOnboardingForceEnabled, "new-user-modules",
-     "nux-email,nux-google-apps,nux-ntp-background,nux-set-as-default,"
+     "nux-google-apps,nux-email,nux-ntp-background,nux-set-as-default,"
      "signin-view"};
 const base::FeatureParam<std::string>
     kNuxOnboardingForceEnabledReturningUserModules = {
         &kNuxOnboardingForceEnabled, "returning-user-modules",
         "nux-set-as-default"};
+// TODO(hcarmona): remove this flag and all code behind it.
 const base::FeatureParam<bool> kNuxOnboardingForceEnabledShowEmailInterstitial =
     {&kNuxOnboardingForceEnabled, "show-email-interstitial", true};
 

chrome/test/data/webui/welcome/welcome_app_test.js

@@ -74,12 +74,15 @@ cr.define('onboarding_welcome_app_test', function() {
       return test_util.waitForRenderOrTimeout0(testElement).then(() => {
         const views = testElement.shadowRoot.querySelectorAll('[slot=view]');
         assertEquals(views.length, 6);
-        assertEquals(views[0].tagName, 'LANDING-VIEW');
-        assertEquals(views[1].tagName, 'NUX-EMAIL');
-        assertEquals(views[2].tagName, 'NUX-GOOGLE-APPS');
-        assertEquals(views[3].tagName, 'NUX-NTP-BACKGROUND');
-        assertEquals(views[4].tagName, 'NUX-SET-AS-DEFAULT');
-        assertEquals(views[5].tagName, 'SIGNIN-VIEW');
+        ['LANDING-VIEW',
+         'NUX-GOOGLE-APPS',
+         'NUX-EMAIL',
+         'NUX-NTP-BACKGROUND',
+         'NUX-SET-AS-DEFAULT',
+         'SIGNIN-VIEW',
+        ].forEach((expectedView, ix) => {
+          assertEquals(expectedView, views[ix].tagName);
+        });
       });
     });
 
@@ -89,11 +92,14 @@ cr.define('onboarding_welcome_app_test', function() {
       return test_util.waitForRenderOrTimeout0(testElement).then(() => {
         const views = testElement.shadowRoot.querySelectorAll('[slot=view]');
         assertEquals(views.length, 5);
-        assertEquals(views[0].tagName, 'LANDING-VIEW');
-        assertEquals(views[1].tagName, 'NUX-EMAIL');
-        assertEquals(views[2].tagName, 'NUX-GOOGLE-APPS');
-        assertEquals(views[3].tagName, 'NUX-NTP-BACKGROUND');
-        assertEquals(views[4].tagName, 'SIGNIN-VIEW');
+        ['LANDING-VIEW',
+         'NUX-GOOGLE-APPS',
+         'NUX-EMAIL',
+         'NUX-NTP-BACKGROUND',
+         'SIGNIN-VIEW',
+        ].forEach((expectedView, ix) => {
+          assertEquals(expectedView, views[ix].tagName);
+        });
       });
     });
 

testing/variations/fieldtrial_testing_config.json

@@ -2866,12 +2866,12 @@
             ],
             "experiments": [
                 {
-                    "name": "EmailAppsThenEmailInterstitial",
+                    "name": "AppsEmailThenNTPLaunched-002",
                     "params": {
-                        "new-user-modules": "nux-email,nux-google-apps,nux-set-as-default,signin-view",
-                        "onboarding-group": "EmailAppsThenEmailInterstitial-001",
+                        "new-user-modules": "nux-google-apps,nux-email,nux-set-as-default,signin-view",
+                        "onboarding-group": "AppsEmailThenNTPLaunchedSynthetic-002",
                         "returning-user-modules": "nux-set-as-default",
-                        "show-email-interstitial": "true"
+                        "show-email-interstitial": "false"
                     },
                     "enable_features": [
                         "NuxOnboarding"