[omnibox] Make Pedals logic dependent on the button row Feature.

Currently it's possible to run all the Pedals code but not actually show
the Pedals if the button row Feature is not enabled. This change makes
the dependence of Pedals on button row explicit.

Bug: 893183
Change-Id: Ib30cec31fa21e8dac138aa0341ace6bc8ea124ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362993
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Reviewed-by: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799249}

components/omnibox/browser/omnibox_field_trial.cc

@@ -724,7 +724,8 @@ bool OmniboxFieldTrial::IsTabSwitchSuggestionsEnabled() {
 }
 
 bool OmniboxFieldTrial::IsPedalSuggestionsEnabled() {
-  return base::FeatureList::IsEnabled(omnibox::kOmniboxPedalSuggestions);
+  return base::FeatureList::IsEnabled(omnibox::kOmniboxSuggestionButtonRow) &&
+         base::FeatureList::IsEnabled(omnibox::kOmniboxPedalSuggestions);
 }
 
 bool OmniboxFieldTrial::IsKeywordSearchButtonEnabled() {

components/omnibox/browser/omnibox_field_trial.h

@@ -398,10 +398,10 @@ bool IsShortBookmarkSuggestionsEnabled();
 // elements like keywords, tab-switch buttons, and Pedals.
 bool IsSuggestionButtonRowEnabled();
 
-// Returns true if either the tab switch suggestions flag is enabled.
+// Returns true if the tab switch suggestions flag is enabled.
 bool IsTabSwitchSuggestionsEnabled();
 
-// Returns true if the Pedals feature is enabled.
+// Returns true if the Pedals and suggestion button row features are enabled.
 bool IsPedalSuggestionsEnabled();
 
 // Returns true if the keyword button and suggestion button row features are