chromeos: Fix "Chrome sync" string in OOBE sync consent dialog

I'm trying to disable SplitSettingsSync on trunk and hitting a test
failure. The CL below accidentally changed the pre-SplitSettingsSync
sync consent screen to say "Chrome browser sync" instead of just
"Chrome sync".

https://chromium-review.googlesource.com/c/chromium/src/+/2154601

Change the original string back to "Chrome sync", introduce a new
string "Chrome browser sync", and update the browser test expectations
so the tests pass both with and without SplitSettingsSync enabled.

Bug: 1013466
Change-Id: I146c7a1c783146e11207aa6a80c011a42bde4e3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2186459
Auto-Submit: James Cook <jamescook@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#766432}

chrome/app/chromeos_strings.grdp

@@ -823,9 +823,12 @@
   <message name="IDS_LOGIN_SYNC_CONSENT_SCREEN_OS_SYNC_DESCRIPTION" desc="Description of 'Settings sync' section of the sync confirmation dialog that is displayed on the first user log in.">
     Your apps, settings, and other customizations will sync across all Chrome OS devices signed in with your Google Account.
   </message>
-  <message name="IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_NAME" desc="Title of the 'Chrome sync' section of the sync confirmation dialog that is displayed on the first user log in.">
+  <message name="IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_BROWSER_SYNC_NAME" desc="Title of the 'Chrome browser sync' section of the sync confirmation dialog that is displayed on the first user log in.">
     Chrome browser sync
   </message>
+  <message name="IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_NAME" desc="Title of the 'Chrome sync' section of the sync confirmation dialog that is displayed on the first user log in.">
+    Chrome sync
+  </message>
   <message name="IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_DESCRIPTION" desc="The description of 'Chrome sync' section of the sync confirmation dialog that is displayed on the first user log in.">
     Your bookmarks, history, passwords, and other settings will be synced to your Google Account so you can use them on all your devices.
   </message>

chrome/app/chromeos_strings_grdp/IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_BROWSER_SYNC_NAME.png.sha1

+4a7d91a37e88b7a646c68ab8d5a675c0abc6c4b3
\ No newline at end of file

chrome/browser/chromeos/login/screens/sync_consent_browsertest.cc

@@ -113,7 +113,7 @@ class SyncConsentTest : public OobeBaseTest {
           IDS_LOGIN_SYNC_CONSENT_SCREEN_TITLE,
           IDS_LOGIN_SYNC_CONSENT_SCREEN_OS_SYNC_NAME,
           IDS_LOGIN_SYNC_CONSENT_SCREEN_OS_SYNC_DESCRIPTION,
-          IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_NAME,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_BROWSER_SYNC_NAME,
           IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_DESCRIPTION,
           IDS_LOGIN_SYNC_CONSENT_SCREEN_REVIEW_BROWSER_SYNC_OPTIONS,
           IDS_LOGIN_SYNC_CONSENT_SCREEN_PERSONALIZE_GOOGLE_SERVICES_NAME,
@@ -459,7 +459,7 @@ IN_PROC_BROWSER_TEST_F(SyncConsentSplitSettingsSyncTest, MAYBE_DefaultFlow) {
       IDS_LOGIN_SYNC_CONSENT_SCREEN_TITLE,
       IDS_LOGIN_SYNC_CONSENT_SCREEN_OS_SYNC_NAME,
       IDS_LOGIN_SYNC_CONSENT_SCREEN_OS_SYNC_DESCRIPTION,
-      IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_NAME,
+      IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_BROWSER_SYNC_NAME,
       IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_DESCRIPTION,
       IDS_LOGIN_SYNC_CONSENT_SCREEN_REVIEW_BROWSER_SYNC_OPTIONS,
       IDS_LOGIN_SYNC_CONSENT_SCREEN_PERSONALIZE_GOOGLE_SERVICES_NAME,

chrome/browser/resources/chromeos/login/sync_consent.html

@@ -101,7 +101,7 @@
           <div class="flex layout vertical center-justified">
             <div role="heading" aria-level="2" class="overview-list-item-title" consent-description
               id="browserSyncName">
-              [[i18nDynamic(locale, 'syncConsentScreenChromeSyncName')]]
+              [[i18nDynamic(locale, 'syncConsentScreenChromeBrowserSyncName')]]
             </div>
             <div class="overview-list-item-description" consent-description>
               [[i18nDynamic(locale, 'syncConsentScreenChromeSyncDescription')]]

chrome/browser/ui/webui/chromeos/login/sync_consent_screen_handler.cc

@@ -116,6 +116,9 @@ void SyncConsentScreenHandler::DeclareLocalizedValues(
   RememberLocalizedValue("syncConsentScreenOsSyncDescription",
                          IDS_LOGIN_SYNC_CONSENT_SCREEN_OS_SYNC_DESCRIPTION,
                          builder);
+  RememberLocalizedValue("syncConsentScreenChromeBrowserSyncName",
+                         IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_BROWSER_SYNC_NAME,
+                         builder);
   RememberLocalizedValue(
       "syncConsentReviewBrowserSyncOptions",
       IDS_LOGIN_SYNC_CONSENT_SCREEN_REVIEW_BROWSER_SYNC_OPTIONS, builder);