[launcher] Remove unused flags for suggested files.

These flags are no longer used, and are not enabled by any Finch config. Change-Id: I4f9fc069f8fff6b7707884bae4252b739f5b54ca Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3783303 Reviewed-by: Amanda Deacon <amandadeacon@chromium.org> Reviewed-by: Toni Barzic <tbarzic@chromium.org> Commit-Queue: Rachel Wong <wrong@chromium.org> Cr-Commit-Position: refs/heads/main@{#1028507}
chromium · Jul 26, 2022 · 90da85c · 90da85c
1 parent c90856b
commit 90da85c
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 59 deletions.
diff --git a/ash/public/cpp/app_list/app_list_features.cc b/ash/public/cpp/app_list/app_list_features.cc
@@ -19,10 +19,6 @@ const base::Feature kEnableZeroStateMixedTypesRanker{
     "EnableZeroStateMixedTypesRanker", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kEnableAppReinstallZeroState{
     "EnableAppReinstallZeroState", base::FEATURE_DISABLED_BY_DEFAULT};
-const base::Feature kEnableSuggestedFiles{"EnableSuggestedFiles",
-                                          base::FEATURE_DISABLED_BY_DEFAULT};
-const base::Feature kEnableSuggestedLocalFiles{
-    "EnableSuggestedLocalFiles", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kEnableAppListLaunchRecording{
     "EnableAppListLaunchRecording", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kLauncherSettingsSearch{"LauncherSettingsSearch",
@@ -63,14 +59,6 @@ bool IsAppReinstallZeroStateEnabled() {
   return base::FeatureList::IsEnabled(kEnableAppReinstallZeroState);
 }
 
-bool IsSuggestedFilesEnabled() {
-  return base::FeatureList::IsEnabled(kEnableSuggestedFiles);
-}
-
-bool IsSuggestedLocalFilesEnabled() {
-  return base::FeatureList::IsEnabled(kEnableSuggestedLocalFiles);
-}
-
 bool IsLauncherSettingsSearchEnabled() {
   return base::FeatureList::IsEnabled(kLauncherSettingsSearch);
 }

diff --git a/ash/public/cpp/app_list/app_list_features.h b/ash/public/cpp/app_list/app_list_features.h
@@ -35,12 +35,6 @@ ASH_PUBLIC_EXPORT extern const base::Feature kEnableZeroStateMixedTypesRanker;
 // zero-state.
 ASH_PUBLIC_EXPORT extern const base::Feature kEnableAppReinstallZeroState;
 
-// Enables Drive file suggestions in the suggestion chips.
-ASH_PUBLIC_EXPORT extern const base::Feature kEnableSuggestedFiles;
-
-// Enables local file suggestions in the suggestion chips.
-ASH_PUBLIC_EXPORT extern const base::Feature kEnableSuggestedLocalFiles;
-
 // Enables hashed recording of a app list launches.
 ASH_PUBLIC_EXPORT extern const base::Feature kEnableAppListLaunchRecording;
 
@@ -83,8 +77,6 @@ ASH_PUBLIC_EXPORT bool IsZeroStateAppsRankerEnabled();
 ASH_PUBLIC_EXPORT bool IsQueryBasedMixedTypesRankerEnabled();
 ASH_PUBLIC_EXPORT bool IsZeroStateMixedTypesRankerEnabled();
 ASH_PUBLIC_EXPORT bool IsAppReinstallZeroStateEnabled();
-ASH_PUBLIC_EXPORT bool IsSuggestedFilesEnabled();
-ASH_PUBLIC_EXPORT bool IsSuggestedLocalFilesEnabled();
 ASH_PUBLIC_EXPORT bool IsAppListLaunchRecordingEnabled();
 ASH_PUBLIC_EXPORT bool IsFuzzyAppSearchEnabled();
 ASH_PUBLIC_EXPORT bool IsExactMatchForNonLatinLocaleEnabled();

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -6795,17 +6795,6 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(feature_engagement::kEnableIPH)},
 #endif  // BUILDFLAG(IS_ANDROID)
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-    {"enable-suggested-files", flag_descriptions::kEnableSuggestedFilesName,
-     flag_descriptions::kEnableSuggestedFilesDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(app_list_features::kEnableSuggestedFiles)},
-
-    {"enable-suggested-local-files",
-     flag_descriptions::kEnableSuggestedLocalFilesName,
-     flag_descriptions::kEnableSuggestedLocalFilesDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(app_list_features::kEnableSuggestedLocalFiles)},
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
-
     {"autofill-always-return-cloud-tokenized-card",
      flag_descriptions::kAutofillAlwaysReturnCloudTokenizedCardName,
      flag_descriptions::kAutofillAlwaysReturnCloudTokenizedCardDescription,

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -2856,16 +2856,6 @@
     "owners": [ "jarrydg", "chrome-owp-storage@google.com" ],
     "expiry_milestone": 89
   },
-  {
-    "name": "enable-suggested-files",
-    "owners": [ "wrong", "tby" ],
-    "expiry_milestone": 100
-  },
-  {
-    "name": "enable-suggested-local-files",
-    "owners": [ "tby", "wrong" ],
-    "expiry_milestone": 100
-  },
   {
     "name": "enable-suggestions-with-substring-match",
     "owners": [ "autofill-squad-muc@google.com" ],

diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.cc b/chrome/browser/ui/app_list/search/files/item_suggest_cache.cc
@@ -206,9 +206,7 @@ ItemSuggestCache::ItemSuggestCache(
     : made_request_(false),
       enabled_(kEnabled.Get()),
       server_url_(kServerUrl.Get()),
-      multiple_queries_per_session_(
-          app_list_features::IsSuggestedFilesEnabled() ||
-          kMultipleQueriesPerSession.Get()),
+      multiple_queries_per_session_(kMultipleQueriesPerSession.Get()),
       on_results_updated_(on_results_updated),
       profile_(profile),
       url_loader_factory_(std::move(url_loader_factory)) {

diff --git a/chrome/browser/ui/app_list/search/files/zero_state_file_provider_unittest.cc b/chrome/browser/ui/app_list/search/files/zero_state_file_provider_unittest.cc
@@ -116,11 +116,6 @@ TEST_P(ZeroStateFileProviderTest, NoResultsWithQuery) {
 }
 
 TEST_P(ZeroStateFileProviderTest, ResultsProvided) {
-  // Disable flag.
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {}, {app_list_features::kEnableSuggestedLocalFiles});
-
   WriteFile("exists_1.txt");
   WriteFile("exists_2.png");
   WriteFile("exists_3.pdf");
@@ -137,11 +132,6 @@ TEST_P(ZeroStateFileProviderTest, ResultsProvided) {
 }
 
 TEST_P(ZeroStateFileProviderTest, OldFilesNotReturned) {
-  // Disable flag.
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {}, {app_list_features::kEnableSuggestedLocalFiles});
-
   WriteFile("new.txt");
   WriteFile("old.png");
   auto now = base::Time::Now();

diff --git a/chrome/browser/ui/app_list/search/mixer.cc b/chrome/browser/ui/app_list/search/mixer.cc
@@ -123,11 +123,6 @@ Mixer::~Mixer() = default;
 void Mixer::InitializeRankers(Profile* profile) {
   search_result_ranker_ = std::make_unique<SearchResultRanker>(profile);
   search_result_ranker_->InitializeRankers();
-
-  if (app_list_features::IsSuggestedFilesEnabled() ||
-      app_list_features::IsSuggestedLocalFilesEnabled()) {
-    chip_ranker_ = std::make_unique<ChipRanker>(profile);
-  }
 }
 
 size_t Mixer::AddGroup(size_t max_results) {