Reland: cros: Fix SyncConsentTest when SplitSettingsSync is enabled

Fix:
I missed one case where we look up an element with the wrong name when
the feature is enabled.

Original description:
SplitSettingsSync adds some text to the OOBE sync consent dialog.
Update test expectations to match, otherwise the test will fail when
we flip the flag.

Bug: 1067212
Test: browser_tests --enable-features=SplitSettingsSync
Change-Id: I5273f94c389f0cb4c2a6f0ac9149e9d65ec24106
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2136881
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Auto-Submit: James Cook <jamescook@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756667}

TBR=xiyuan@chromium.org

Change-Id: I5273f94c389f0cb4c2a6f0ac9149e9d65ec24106
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2136871Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756786}

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

@@ -97,6 +97,29 @@ class SyncConsentTest : public OobeBaseTest {
   void SetUpOnMainThread() override {
     OobeBaseTest::SetUpOnMainThread();
     branded_build_override_ = WizardController::ForceBrandedBuildForTesting();
+    if (features::IsSplitSettingsSyncEnabled()) {
+      expected_consent_ids_ = {
+          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_SYNC_DESCRIPTION,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_REVIEW_BROWSER_SYNC_OPTIONS,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_PERSONALIZE_GOOGLE_SERVICES_NAME,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_PERSONALIZE_GOOGLE_SERVICES_DESCRIPTION,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_ACCEPT_AND_CONTINUE,
+      };
+    } else {
+      expected_consent_ids_ = {
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_TITLE,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_NAME,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_DESCRIPTION,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_PERSONALIZE_GOOGLE_SERVICES_NAME,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_PERSONALIZE_GOOGLE_SERVICES_DESCRIPTION,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_REVIEW_SYNC_OPTIONS_LATER,
+          IDS_LOGIN_SYNC_CONSENT_SCREEN_ACCEPT_AND_CONTINUE,
+      };
+    }
   }
 
   void TearDownOnMainThread() override {
@@ -158,8 +181,13 @@ class SyncConsentTest : public OobeBaseTest {
     screen->OnStateChanged(nullptr);
     test::OobeJS().CreateVisibilityWaiter(true, {"sync-consent-impl"})->Wait();
 
-    test::OobeJS().ExpectVisiblePath(
-        {"sync-consent-impl", "syncConsentOverviewDialog"});
+    if (features::IsSplitSettingsSyncEnabled()) {
+      test::OobeJS().ExpectVisiblePath(
+          {"sync-consent-impl", "splitSettingsSyncConsentDialog"});
+    } else {
+      test::OobeJS().ExpectVisiblePath(
+          {"sync-consent-impl", "syncConsentOverviewDialog"});
+    }
     test::OobeJS().TapOnPath(
         {"sync-consent-impl", "settingsSaveAndContinueButton"});
     consent_recorded_waiter.Wait();
@@ -174,7 +202,7 @@ class SyncConsentTest : public OobeBaseTest {
               consent_recorded_waiter.consent_description_strings_);
     EXPECT_EQ(expected_consent_confirmation_string,
               consent_recorded_waiter.consent_confirmation_string_);
-    EXPECT_EQ(expected_consent_ids,
+    EXPECT_EQ(expected_consent_ids_,
               consent_recorded_waiter.consent_description_ids_);
     EXPECT_EQ(expected_consent_confirmation_id,
               consent_recorded_waiter.consent_confirmation_id_);
@@ -182,23 +210,14 @@ class SyncConsentTest : public OobeBaseTest {
 
   std::vector<std::string> GetLocalizedExpectedConsentStrings() const {
     std::vector<std::string> result;
-    for (const int& id : expected_consent_ids) {
+    for (const int& id : expected_consent_ids_) {
       result.push_back(GetLocalizedConsentString(id));
     }
     return result;
   }
 
-  const std::vector<int> expected_consent_ids = {
-      IDS_LOGIN_SYNC_CONSENT_SCREEN_TITLE,
-      IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_NAME,
-      IDS_LOGIN_SYNC_CONSENT_SCREEN_CHROME_SYNC_DESCRIPTION,
-      IDS_LOGIN_SYNC_CONSENT_SCREEN_PERSONALIZE_GOOGLE_SERVICES_NAME,
-      IDS_LOGIN_SYNC_CONSENT_SCREEN_PERSONALIZE_GOOGLE_SERVICES_DESCRIPTION,
-      IDS_LOGIN_SYNC_CONSENT_SCREEN_REVIEW_SYNC_OPTIONS_LATER,
-      IDS_LOGIN_SYNC_CONSENT_SCREEN_ACCEPT_AND_CONTINUE,
-  };
-
   std::unique_ptr<base::AutoReset<bool>> branded_build_override_;
+  std::vector<int> expected_consent_ids_;
   FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
 
  private:
@@ -209,15 +228,35 @@ IN_PROC_BROWSER_TEST_F(SyncConsentTest, SyncConsentRecorder) {
   EXPECT_EQ(g_browser_process->GetApplicationLocale(), "en-US");
   LoginToSyncConsentScreen();
   // For En-US we hardcode strings here to catch string issues too.
-  const std::vector<std::string> expected_consent_strings(
-      {"You're signed in!", "Chrome sync",
-       "Your bookmarks, history, passwords, and other settings will be synced "
-       "to your Google Account so you can use them on all your devices.",
-       "Personalize Google services",
-       "Google may use your browsing history to personalize Search, ads, and "
-       "other Google services. You can change this anytime at "
-       "myaccount.google.com/activitycontrols/search",
-       "Review sync options following setup", "Accept and continue"});
+  std::vector<std::string> expected_consent_strings;
+  if (features::IsSplitSettingsSyncEnabled()) {
+    expected_consent_strings = {
+        "You're signed in!",
+        "Settings sync",
+        "Your apps, settings, and other customizations will sync across all "
+        "Chrome OS devices signed in with your Google Account.",
+        "Chrome sync",
+        "Your bookmarks, history, passwords, and other settings will be synced "
+        "to your Google Account so you can use them on all your devices.",
+        "Review browser sync options following setup",
+        "Personalize Google services",
+        "Google may use your browsing history to personalize Search, ads, and "
+        "other Google services. You can change this anytime at "
+        "myaccount.google.com/activitycontrols/search",
+        "Accept and continue"};
+  } else {
+    expected_consent_strings = {
+        "You're signed in!",
+        "Chrome sync",
+        "Your bookmarks, history, passwords, and other settings will be synced "
+        "to your Google Account so you can use them on all your devices.",
+        "Personalize Google services",
+        "Google may use your browsing history to personalize Search, ads, and "
+        "other Google services. You can change this anytime at "
+        "myaccount.google.com/activitycontrols/search",
+        "Review sync options following setup",
+        "Accept and continue"};
+  }
   const std::string expected_consent_confirmation_string =
       "Accept and continue";
   SyncConsentRecorderTestImpl(expected_consent_strings,