Bug 1611011 - changes to about:welcome modal template & relevant mochitest r=pdahiya

Differential Revision: https://phabricator.services.mozilla.com/D61177

--HG--
extra : moz-landing-system : lando

browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx

@@ -127,6 +127,7 @@ export class Trailhead extends React.PureComponent {
               UTMTerm={UTMTerm}
               flowParams={this.props.flowParams}
               onClose={this.closeModal}
+              showSignInLink={true}
             />
           </div>
         </div>

browser/components/newtab/data/content/activity-stream.bundle.js

@@ -3085,7 +3085,8 @@ class Trailhead extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureCompone
       fxaEndpoint: this.props.fxaEndpoint,
       UTMTerm: UTMTerm,
       flowParams: this.props.flowParams,
-      onClose: this.closeModal
+      onClose: this.closeModal,
+      showSignInLink: true
     }))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
       className: "trailheadStart",
       "data-l10n-id": content.skipButton.string_id,

browser/components/newtab/lib/OnboardingMessageProvider.jsm

@@ -72,7 +72,7 @@ const TRAILHEAD_FULL_PAGE_CONTENT = {
 const JOIN_CONTENT = {
   className: "joinCohort",
   title: { string_id: "onboarding-welcome-body" },
-  benefits: ["products", "knowledge", "privacy"].map(id => ({
+  benefits: ["sync", "monitor", "lockwise"].map(id => ({
     id,
     title: { string_id: `onboarding-benefit-${id}-title` },
     text: { string_id: `onboarding-benefit-${id}-text` },
@@ -82,7 +82,7 @@ const JOIN_CONTENT = {
     url: "https://www.mozilla.org/firefox/accounts/",
   },
   form: {
-    title: { string_id: "onboarding-join-form-header" },
+    title: { string_id: "onboarding-welcome-form-header" },
     text: { string_id: "onboarding-join-form-body" },
     email: { string_id: "onboarding-join-form-email" },
     button: { string_id: "onboarding-join-form-continue" },

browser/components/newtab/test/browser/browser_aboutwelcome.js

@@ -134,9 +134,9 @@ add_task(async function test_trailhead_branches() {
     [
       ".trailhead.joinCohort",
       "h3[data-l10n-id=onboarding-welcome-form-header]",
-      "p[data-l10n-id=onboarding-benefit-products-text]",
-      "p[data-l10n-id=onboarding-benefit-knowledge-text]",
-      "p[data-l10n-id=onboarding-benefit-privacy-text]",
+      "p[data-l10n-id=onboarding-benefit-sync-text]",
+      "p[data-l10n-id=onboarding-benefit-monitor-text]",
+      "p[data-l10n-id=onboarding-benefit-lockwise-text]",
     ]
   );