| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 5ef20394f1ac1d83db0d02b9f6cdf20257e35d01..548edf9ea45ca60dcb81993e36d95fd981efe3a3 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -563,14 +563,6 @@ const FeatureEntry::Choice kHerbPrototypeChoices[] = {
|
| {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
|
| {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
|
| switches::kTabManagementExperimentTypeDisabled, ""},
|
| - {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_ANISE,
|
| - switches::kTabManagementExperimentTypeAnise, ""},
|
| - {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_BASIL,
|
| - switches::kTabManagementExperimentTypeBasil, ""},
|
| - {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_CHIVE,
|
| - switches::kTabManagementExperimentTypeChive, ""},
|
| - {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_DILL,
|
| - switches::kTabManagementExperimentTypeDill, ""},
|
| {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_ELDERBERRY,
|
| switches::kTabManagementExperimentTypeElderberry, ""},
|
| };
|
| @@ -2021,14 +2013,6 @@ bool SkipConditionalFeatureEntry(const FeatureEntry& entry) {
|
| channel != version_info::Channel::UNKNOWN) {
|
| return true;
|
| }
|
| - // Tab management prototypes are only available for local, Canary, and Dev
|
| - // channel builds.
|
| - if (!strcmp("tab-management-experiment-type", entry.internal_name) &&
|
| - channel != version_info::Channel::DEV &&
|
| - channel != version_info::Channel::CANARY &&
|
| - channel != version_info::Channel::UNKNOWN) {
|
| - return true;
|
| - }
|
| // enable-tab-switcher-in-document-mode is only available for Chromium
|
| // builds and the Canary channel.
|
| if (!strcmp("enable-tab-switcher-in-document-mode",
|
|
|