[omnibox] Enable suggestion UI changes by default.

This is in preparation for launching on M69+ Stable.

Bug: 794201, 794203, 794204
Change-Id: I800af4d71755911314afc7e6406899189deaaf11
Reviewed-on: https://chromium-review.googlesource.com/1197104
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588920}

components/omnibox/browser/omnibox_field_trial.cc

@@ -136,18 +136,26 @@ const base::Feature kUIExperimentJogTextfieldOnPopup{
     "OmniboxUIExperimentJogTextfieldOnPopup",
     base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Feature used for showing the URL suggestion favicons as a UI experiment.
+// Feature used for showing the URL suggestion favicons as a UI experiment,
+// currently only used on desktop platforms.
 const base::Feature kUIExperimentShowSuggestionFavicons{
     "OmniboxUIExperimentShowSuggestionFavicons",
-    base::FEATURE_DISABLED_BY_DEFAULT};
+    base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Feature used to always swap the title and URL.
 const base::Feature kUIExperimentSwapTitleAndUrl{
-    "OmniboxUIExperimentSwapTitleAndUrl", base::FEATURE_DISABLED_BY_DEFAULT};
+    "OmniboxUIExperimentSwapTitleAndUrl",
+#if defined(OS_IOS) || defined(OS_ANDROID)
+    base::FEATURE_DISABLED_BY_DEFAULT
+#else
+    base::FEATURE_ENABLED_BY_DEFAULT
+#endif
+};
 
-// Feature used for the vertical margin UI experiment.
+// Feature used for the vertical margin UI experiment, currently only used on
+// desktop platforms.
 const base::Feature kUIExperimentVerticalMargin{
-    "OmniboxUIExperimentVerticalMargin", base::FEATURE_DISABLED_BY_DEFAULT};
+    "OmniboxUIExperimentVerticalMargin", base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Feature used to enable speculatively starting a service worker associated
 // with the destination of the default match when the user's input looks like a
@@ -766,10 +774,8 @@ int OmniboxFieldTrial::GetSuggestionVerticalMargin() {
   if (base::FeatureList::IsEnabled(features::kExperimentalUi))
     return 10;
 
-  using Md = ui::MaterialDesignController;
   return base::GetFieldTrialParamByFeatureAsInt(
-      omnibox::kUIExperimentVerticalMargin, kUIVerticalMarginParam,
-      Md::GetMode() == Md::MATERIAL_HYBRID ? 8 : 4);
+      omnibox::kUIExperimentVerticalMargin, kUIVerticalMarginParam, 10);
 }
 
 const char OmniboxFieldTrial::kBundledExperimentFieldTrialName[] =

testing/variations/fieldtrial_testing_config.json

@@ -2867,9 +2867,6 @@
                         "OmniboxRichEntitySuggestions",
                         "OmniboxTabSwitchSuggestions",
                         "OmniboxTailSuggestions",
-                        "OmniboxUIExperimentShowSuggestionFavicons",
-                        "OmniboxUIExperimentSwapTitleAndUrl",
-                        "OmniboxUIExperimentVerticalMargin",
                         "ZeroSuggestRedirectToChrome",
                         "ZeroSuggestSwapTitleAndUrl"
                     ]