GitLab

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}