[omnibox] Add a flag setting the unfocused omnibox background white.

- This CL adds a chrome://flags flag for crrev.com/c/1474281.
- Additionally, in about_flags.cc and flag-metadata.json, it orders
omnibox-ui-use-generic-search-engine-icon below
omnibox-ui-show-suffix-on-all-search-suggestions, as in
omnibox_field_trial.cc.

Bug: 931836
Change-Id: If5a1a104c1bece5396c54630a55cb4190ed872cb
Reviewed-on: https://chromium-review.googlesource.com/c/1487363Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Kevin Bailey <krb@chromium.org>
Commit-Queue: manuk hovanesian <manukh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635544}

chrome/browser/about_flags.cc

@@ -2994,12 +2994,6 @@ const FeatureEntry kFeatureEntries[] = {
      kOsDesktop,
      FEATURE_VALUE_TYPE(omnibox::kUIExperimentBlueTitlesOnPageSuggestions)},
 
-    {"omnibox-ui-use-generic-search-engine-icon",
-     flag_descriptions::kOmniboxUIUseGenericSearchEngineIconName,
-     flag_descriptions::kOmniboxUIUseGenericSearchEngineIconDescription,
-     kOsDesktop,
-     FEATURE_VALUE_TYPE(omnibox::kUIExperimentUseGenericSearchEngineIcon)},
-
     {"omnibox-ui-show-suffix-on-all-search-suggestions",
      flag_descriptions::kOmniboxUIShowSuffixOnAllSearchSuggestionsName,
      flag_descriptions::kOmniboxUIShowSuffixOnAllSearchSuggestionsDescription,
@@ -3007,6 +3001,17 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(
          omnibox::kUIExperimentShowSuffixOnAllSearchSuggestions)},
 
+    {"omnibox-ui-white-background-on-blur",
+     flag_descriptions::kOmniboxUIWhiteBackgroundOnBlurName,
+     flag_descriptions::kOmniboxUIWhiteBackgroundOnBlurDescription, kOsDesktop,
+     FEATURE_VALUE_TYPE(omnibox::kUIExperimentWhiteBackgroundOnBlur)},
+
+    {"omnibox-ui-use-generic-search-engine-icon",
+     flag_descriptions::kOmniboxUIUseGenericSearchEngineIconName,
+     flag_descriptions::kOmniboxUIUseGenericSearchEngineIconDescription,
+     kOsDesktop,
+     FEATURE_VALUE_TYPE(omnibox::kUIExperimentUseGenericSearchEngineIcon)},
+
     {"omnibox-material-design-weather-icons",
      flag_descriptions::kOmniboxMaterialDesignWeatherIconsName,
      flag_descriptions::kOmniboxMaterialDesignWeatherIconsDescription,

chrome/browser/flag-metadata.json

@@ -2572,12 +2572,17 @@
     "expiry_milestone": 80
   },
   {
-    "name": "omnibox-ui-use-generic-search-engine-icon",
+    "name": "omnibox-ui-show-suffix-on-all-search-suggestions",
     "owners": [ "tommycli", "chrome-omnibox-team@google.com" ],
     "expiry_milestone": 80
   },
   {
-    "name": "omnibox-ui-show-suffix-on-all-search-suggestions",
+    "name": "omnibox-ui-white-background-on-blur",
+    "owners": [ "tommycli", "chrome-omnibox-team@google.com" ],
+    "expiry_milestone": 80
+  },
+  {
+    "name": "omnibox-ui-use-generic-search-engine-icon",
     "owners": [ "tommycli", "chrome-omnibox-team@google.com" ],
     "expiry_milestone": 80
   },

chrome/browser/flag_descriptions.cc

@@ -1422,6 +1422,11 @@ const char kOmniboxUIVerticalMarginName[] = "Omnibox UI Vertical Margin";
 const char kOmniboxUIVerticalMarginDescription[] =
     "Changes the vertical margin in the Omnibox UI.";
 
+const char kOmniboxUIWhiteBackgroundOnBlurName[] =
+    "Omnibox UI White Background On Blur";
+const char kOmniboxUIWhiteBackgroundOnBlurDescription[] =
+    "Set the omnibox background white when it's unfocused.";
+
 const char kOmniboxVoiceSearchAlwaysVisibleName[] =
     "Omnibox Voice Search Always Visible";
 const char kOmniboxVoiceSearchAlwaysVisibleDescription[] =

chrome/browser/flag_descriptions.h

@@ -859,6 +859,9 @@ extern const char kOmniboxUIUseGenericSearchEngineIconDescription[];
 extern const char kOmniboxUIVerticalMarginName[];
 extern const char kOmniboxUIVerticalMarginDescription[];
 
+extern const char kOmniboxUIWhiteBackgroundOnBlurName[];
+extern const char kOmniboxUIWhiteBackgroundOnBlurDescription[];
+
 extern const char kOmniboxVoiceSearchAlwaysVisibleName[];
 extern const char kOmniboxVoiceSearchAlwaysVisibleDescription[];
 

tools/metrics/histograms/enums.xml

@@ -31969,6 +31969,8 @@ from previous Chrome versions.
   <int value="-192389983" label="NoStatePrefetch:enabled"/>
   <int value="-191256027" label="AvoidFlashBetweenNavigation:disabled"/>
   <int value="-185162926" label="IncreaseInputAudioBufferSize:enabled"/>
+  <int value="-184091779"
+      label="OmniboxUIExperimentWhiteBackgroundOnBlur:enabled"/>
   <int value="-183246373" label="enable-multilingual-spellchecker"/>
   <int value="-181590721"
       label="AutofillEnforceMinRequiredFieldsForHeuristics:enabled"/>
@@ -33033,6 +33035,8 @@ from previous Chrome versions.
   <int value="1614309501" label="DataSaverLiteModeRebranding:enabled"/>
   <int value="1614596813" label="CloseButtonsInactiveTabs:disabled"/>
   <int value="1615988672" label="GrantNotificationsToDSE:enabled"/>
+  <int value="1616938915"
+      label="OmniboxUIExperimentWhiteBackgroundOnBlur:disabled"/>
   <int value="1617187093" label="enable-improved-a2hs"/>
   <int value="1618633341" label="MashOopViz:enabled"/>
   <int value="1621298798" label="VrBrowserKeyboard:enabled"/>