[omnibox] Added flag for group by suggestion type feature

This CL only adds a flag for a previously added feature: group
suggestions by search vs URL.

Bug: 966462
Change-Id: I37d956baadad1a2bb5ea9968f4959933c0c61b2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1631299
Commit-Queue: Kevin Bailey <krb@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663809}

chrome/browser/about_flags.cc

@@ -2359,6 +2359,12 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kOmniboxRichEntitySuggestionsDescription, kOsAll,
      FEATURE_VALUE_TYPE(omnibox::kOmniboxRichEntitySuggestions)},
 
+    {"omnibox-group-suggestions-by-search-vs-url",
+     flag_descriptions::kOmniboxGroupSuggestionsBySearchVsUrlName,
+     flag_descriptions::kOmniboxGroupSuggestionsBySearchVsUrlDescription,
+     kOsAll,
+     FEATURE_VALUE_TYPE(omnibox::kOmniboxGroupSuggestionsBySearchVsUrl)},
+
     {"omnibox-local-entity-suggestions",
      flag_descriptions::kOmniboxLocalEntitySuggestionsName,
      flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,

chrome/browser/flag-metadata.json

@@ -2385,6 +2385,11 @@
     "owners": [ "krb", "chrome-omnibox-team@google.com" ],
     "expiry_milestone": 76
   },
+  {
+    "name": "omnibox-group-suggestions-by-search-vs-url",
+    "owners": [ "krb", "chrome-omnibox-team@google.com" ],
+    "expiry_milestone": 80
+  },
   {
     "name": "omnibox-material-design-weather-icons",
     "owners": [ "manukh", "chromium-omnibox-team" ],

chrome/browser/flag_descriptions.cc

@@ -1236,6 +1236,12 @@ const char kOmniboxDisplayTitleForCurrentUrlDescription[] =
     "the current page is provided as the first suggestion without a title. "
     "Enabling this flag causes the title to be displayed.";
 
+const char kOmniboxGroupSuggestionsBySearchVsUrlName[] =
+    "Omnibox Group Suggestions By Search vs URL";
+const char kOmniboxGroupSuggestionsBySearchVsUrlDescription[] =
+    "Group suggestions by major type, search then navigation, except for "
+    "the default match which must be first.";
+
 const char kOmniboxLocalEntitySuggestionsName[] =
     "Omnibox Local Entity Suggestions";
 const char kOmniboxLocalEntitySuggestionsDescription[] =

chrome/browser/flag_descriptions.h

@@ -758,6 +758,9 @@ extern const char kOmniboxAlternateMatchDescriptionSeparatorDescription[];
 extern const char kOmniboxDisplayTitleForCurrentUrlName[];
 extern const char kOmniboxDisplayTitleForCurrentUrlDescription[];
 
+extern const char kOmniboxGroupSuggestionsBySearchVsUrlName[];
+extern const char kOmniboxGroupSuggestionsBySearchVsUrlDescription[];
+
 extern const char kOmniboxLocalEntitySuggestionsName[];
 extern const char kOmniboxLocalEntitySuggestionsDescription[];
 

tools/metrics/histograms/enums.xml

@@ -33033,6 +33033,8 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="-1999892428" label="force-ui-direction"/>
   <int value="-1999617045" label="PDFAnnotations:disabled"/>
   <int value="-1998927516" label="enable-md-settings"/>
+  <int value="-1996233283"
+      label="OmniboxGroupSuggestionsBySearchVsUrl:enabled"/>
   <int value="-1992319691" label="AvoidFlashBetweenNavigation:enabled"/>
   <int value="-1989747818" label="TabStripKeyboardFocus:disabled"/>
   <int value="-1985452239" label="SmartDim20190221:disabled"/>
@@ -34068,6 +34070,8 @@ from previous Chrome versions.
   <int value="-506366023" label="VizHitTest:enabled"/>
   <int value="-505679399" label="FontCacheScaling:enabled"/>
   <int value="-503430431" label="XRSandbox:enabled"/>
+  <int value="-499186481"
+      label="OmniboxGroupSuggestionsBySearchVsUrl:disabled"/>
   <int value="-498740735" label="ArcUsbHost:disabled"/>
   <int value="-498463128" label="MacSystemShareMenu:enabled"/>
   <int value="-496119023" label="WebXR:enabled"/>