Navi: Ensure defaults are same as launch args

Bug: 993611
Change-Id: Ic55ad673343ace5faf48f7912ac5b615d0043d1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1751776Reviewed-by: Esmael Elmoslimany <aee@chromium.org>
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688324}

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

@@ -31,7 +31,7 @@ namespace welcome {
 
 // Available modules for both new and returning users.
 const char kDefaultNewUserModules[] =
-    "nux-google-apps,nux-set-as-default,signin-view";
+    "nux-google-apps,nux-ntp-background,nux-set-as-default,signin-view";
 const char kDefaultReturningUserModules[] = "nux-set-as-default";
 
 // Feature flag.
@@ -49,11 +49,9 @@ const base::FeatureParam<std::string> kReturningUserModules{
     &kFeature, "returning-user-modules", kDefaultReturningUserModules};
 // For testing purposes
 const base::FeatureParam<std::string> kForceEnabledNewUserModules = {
-    &kForceEnabled, "new-user-modules",
-    "nux-google-apps,nux-ntp-background,nux-set-as-default,"
-    "signin-view"};
+    &kForceEnabled, "new-user-modules", kDefaultNewUserModules};
 const base::FeatureParam<std::string> kForceEnabledReturningUserModules = {
-    &kForceEnabled, "returning-user-modules", "nux-set-as-default"};
+    &kForceEnabled, "returning-user-modules", kDefaultReturningUserModules};
 
 // FeatureParam for app variation.
 const base::FeatureParam<bool> kShowGoogleApp{&kFeature,