diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java index ad336a5020e446..e9f7bcdca80a22 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java @@ -14,13 +14,12 @@ import android.text.TextUtils; import org.chromium.base.ApiCompatibilityUtils; -import org.chromium.base.CommandLine; import org.chromium.base.ContextUtils; import org.chromium.base.VisibleForTesting; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; -import org.chromium.chrome.browser.ChromeSwitches; +import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.UrlConstants; import org.chromium.chrome.browser.document.ChromeLauncherActivity; @@ -293,8 +292,6 @@ public static void finishActivityOnPhone(Context context) { * @return Whether "all bookmarks" section is enabled. */ static boolean isAllBookmarksViewEnabled() { - String flag = CommandLine.getInstance() - .getSwitchValue(ChromeSwitches.ENABLE_ALL_BOOKMARKS_VIEW, "false"); - return flag.equals("true"); + return ChromeFeatureList.isEnabled("AllBookmarks"); } } diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index ea354261692018..026e317a469704 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -614,14 +614,6 @@ const FeatureEntry::Choice kHerbPrototypeChoices[] = { {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_ELDERBERRY, switches::kTabManagementExperimentTypeElderberry, ""}, }; - -const FeatureEntry::Choice kEnableAllBookmarksViewChoices[] = { - { IDS_FLAGS_ENABLE_ALL_BOOKMARKS_VIEW_CHOICE_DEFAULT, "", ""}, - { IDS_FLAGS_ENABLE_ALL_BOOKMARKS_VIEW_CHOICE_ENABLED, - switches::kEnableAllBookmarksView, "true" }, - { IDS_FLAGS_ENABLE_ALL_BOOKMARKS_VIEW_CHOICE_DISABLED, - switches::kEnableAllBookmarksView, "false" }, -}; #endif // defined(OS_ANDROID) const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = { @@ -1287,7 +1279,7 @@ const FeatureEntry kFeatureEntries[] = { #if defined(OS_ANDROID) {"enable-all-bookmarks-view", IDS_FLAGS_ENABLE_ALL_BOOKMARKS_VIEW_NAME, IDS_FLAGS_SHOW_ALL_BOOKMARKS_VIEW_DESCRIPTION, kOsAndroid, - MULTI_VALUE_TYPE(kEnableAllBookmarksViewChoices)}, + FEATURE_VALUE_TYPE(chrome::android::kAllBookmarksFeature)}, {"enable-accessibility-tab-switcher", IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_NAME, IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, kOsAndroid, diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc index d6acdccdfabece..37bbe98f4b46aa 100644 --- a/chrome/browser/android/chrome_feature_list.cc +++ b/chrome/browser/android/chrome_feature_list.cc @@ -32,6 +32,7 @@ const base::Feature* kFeaturesExposedToJava[] = { &features::kCredentialManagementAPI, &features::kSimplifiedFullscreenUI, &features::kWebPayments, + &kAllBookmarksFeature, &kAndroidPayIntegrationV1, &kImportantSitesInCBD, &kNTPFakeOmniboxTextFeature, @@ -53,6 +54,9 @@ const base::Feature* kFeaturesExposedToJava[] = { } // namespace +const base::Feature kAllBookmarksFeature{"AllBookmarks", + base::FEATURE_ENABLED_BY_DEFAULT}; + const base::Feature kImportantSitesInCBD{"ImportantSitesInCBD", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h index b66d24f89a3574..d0e80962581c10 100644 --- a/chrome/browser/android/chrome_feature_list.h +++ b/chrome/browser/android/chrome_feature_list.h @@ -12,6 +12,7 @@ namespace chrome { namespace android { +extern const base::Feature kAllBookmarksFeature; extern const base::Feature kAndroidPayIntegrationV1; extern const base::Feature kImportantSitesInCBD; extern const base::Feature kNTPMaterialDesign; diff --git a/testing/variations/fieldtrial_testing_config_android.json b/testing/variations/fieldtrial_testing_config_android.json index 465d50e6fe296a..12754d664a2e2c 100644 --- a/testing/variations/fieldtrial_testing_config_android.json +++ b/testing/variations/fieldtrial_testing_config_android.json @@ -1,4 +1,12 @@ { + "AllBookmarks": [ + { + "enable_features": [ + "AllBookmarks" + ], + "group_name": "Enabled" + } + ], "AndroidSessionNotifications": [ { "group_name": "Disabled"