Revert "Remove user-facing Jelly Flag"

This reverts commit 2f48363.

Reason for revert: b/305479175

Failing tast tests e.g. wmp.DesksTemplatesBasic

Tast tests are checking if 'Jelly' is enabled, but this CL renames
to 'Jelly_LAUNCHED'
https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/tast-tests/src/go.chromium.org/tast-tests/cros/local/chrome/ash/desks.go;l=53;drc=e575b5a30a21a3a06cd36b42cdfdeb0d6743a385


Original change's description:
> Remove user-facing Jelly Flag
>
> Feature launched in M117 so code is being cleaned up. Feature has a lot
> of usage so removal will happen in pieces.
>
> Change-Id: I8831c8c1ad1c75f351ae64f8ea23ee9804c31063
> Bug: b:291622031
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4938308
> Auto-Submit: Sean Kau <skau@chromium.org>
> Reviewed-by: Xiaodan Zhu <zxdan@chromium.org>
> Commit-Queue: Xiaodan Zhu <zxdan@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1209647}

Bug: b:291622031
Bug: b/305479175
Change-Id: I5b6487d06591b76f7c4f5e72d64523e7b80321f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4937043
Owners-Override: Joel Hockey <joelhockey@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Sean Kau <skau@chromium.org>
Commit-Queue: Sean Kau <skau@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1209960}

chrome/browser/about_flags.cc

@@ -4263,6 +4263,9 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-cros-privacy-hub", flag_descriptions::kCrosPrivacyHubName,
      flag_descriptions::kCrosPrivacyHubDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(ash::features::kCrosPrivacyHub)},
+    {"jelly-colors", flag_descriptions::kJellyColorsName,
+     flag_descriptions::kJellyColorsDescription, kOsCrOS | kOsLacros,
+     FEATURE_VALUE_TYPE(chromeos::features::kJelly)},
     {"cros-components", flag_descriptions::kCrosComponentsName,
      flag_descriptions::kCrosComponentsDescription, kOsCrOS | kOsLacros,
      FEATURE_VALUE_TYPE(chromeos::features::kCrosComponents)},

chromeos/constants/chromeos_features.cc

@@ -89,13 +89,11 @@ BASE_FEATURE(kIWAForTelemetryExtensionAPI,
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 // Enables Jelly features. go/jelly-flags
-BASE_FEATURE(kJelly, "Jelly_LAUNCHED", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kJelly, "Jelly", base::FEATURE_ENABLED_BY_DEFAULT);
 
 // Enables Jellyroll features. Jellyroll is a feature flag for CrOSNext, which
 // controls all system UI updates and new system components. go/jelly-flags
-BASE_FEATURE(kJellyroll,
-             "Jellyroll_LAUNCHED",
-             base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kJellyroll, "Jellyroll", base::FEATURE_ENABLED_BY_DEFAULT);
 
 // Controls enabling / disabling the orca feature.
 BASE_FEATURE(kOrca, "Orca", base::FEATURE_DISABLED_BY_DEFAULT);