[M115 branch 5790 merge] Further restrict promoted ActionsInSuggest t…

…o top position.

(cherry picked from commit 5f98aec)

Bug: 1450696
Change-Id: Ib12c5cfdbb79f3b0b4ff3ddc6ad897da98622e4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4581730
Commit-Queue: Tomasz Wiszkowski <ender@google.com>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Auto-Submit: Tomasz Wiszkowski <ender@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1152142}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4584413
Reviewed-by: Krishna Govind <govind@chromium.org>
Reviewed-by: Tomasz Wiszkowski <ender@google.com>
Owners-Override: Krishna Govind <govind@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/branch-heads/5790@{#277}
Cr-Branched-From: 1d71a33-refs/heads/main@{#1148114}

components/omnibox/browser/autocomplete_result.cc

@@ -542,7 +542,9 @@ void AutocompleteResult::TrimOmniboxActions(bool is_zero_suggest) {
   // - In every case, HISTORY_CLUSTERS is preferred over PEDALs.
   // - TAB_SWITCH actions are not considered because they're never attached.
   if constexpr (is_android) {
-    static constexpr size_t ACTIONS_IN_SUGGEST_CUTOFF_THRESHOLD = 2;
+    const size_t ACTIONS_IN_SUGGEST_CUTOFF_THRESHOLD =
+        OmniboxFieldTrial::kActionsInSuggestPromoteEntitySuggestion.Get() ? 1
+                                                                          : 2;
     static constexpr size_t PEDALS_CUTOFF_THRESHOLD = 3;
     std::vector<OmniboxActionId> include_all{OmniboxActionId::ACTION_IN_SUGGEST,
                                              OmniboxActionId::HISTORY_CLUSTERS,