Extend the scope of OmniboxUiShowSuggestionFavicons finch feature flag.

This change lays a corner stone for works on Omnibox site favicons.

Doc: http://doc/1-gTFVwUV2uq374osWmK-Ll4gsUiz6eUz85GOm-BuPl8
Bug: 949753
Change-Id: I1de3ca7a2f2089f07ac3b65c43382a27ab525f11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1553952Reviewed-by: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Ender <ender@google.com>
Cr-Commit-Position: refs/heads/master@{#648706}

chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java

@@ -284,6 +284,8 @@ public abstract class ChromeFeatureList {
             "OmniboxUIExperimentHideSteadyStateUrlTrivialSubdomains";
     public static final String OMNIBOX_NEW_ANSWER_LAYOUT = "OmniboxNewAnswerLayout";
     public static final String OMNIBOX_RICH_ENTITY_SUGGESTIONS = "OmniboxRichEntitySuggestions";
+    public static final String OMNIBOX_SHOW_SUGGESTION_FAVICONS =
+            "OmniboxUIExperimentShowSuggestionFavicons";
     public static final String OMNIBOX_SPARE_RENDERER = "OmniboxSpareRenderer";
     public static final String OVERSCROLL_HISTORY_NAVIGATION = "OverscrollHistoryNavigation";
     public static final String PAY_WITH_GOOGLE_V1 = "PayWithGoogleV1";

chrome/browser/about_flags.cc

@@ -2723,7 +2723,8 @@ const FeatureEntry kFeatureEntries[] = {
 
     {"omnibox-ui-show-suggestion-favicons",
      flag_descriptions::kOmniboxUIShowSuggestionFaviconsName,
-     flag_descriptions::kOmniboxUIShowSuggestionFaviconsDescription, kOsDesktop,
+     flag_descriptions::kOmniboxUIShowSuggestionFaviconsDescription,
+     kOsDesktop | kOsAndroid,
      FEATURE_VALUE_TYPE(omnibox::kUIExperimentShowSuggestionFavicons)},
 
     {"omnibox-ui-swap-title-and-url",

chrome/browser/android/chrome_feature_list.cc

@@ -200,6 +200,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &omnibox::kOmniboxNewAnswerLayout,
     &omnibox::kOmniboxRichEntitySuggestions,
     &omnibox::kQueryInOmnibox,
+    &omnibox::kUIExperimentShowSuggestionFavicons,
     &password_manager::features::kGooglePasswordManager,
     &password_manager::features::kPasswordsKeyboardAccessory,
     &previews::features::kDataSaverLiteModeRebranding,

components/omnibox/common/omnibox_features.cc

@@ -171,8 +171,13 @@ const base::Feature kQueryInOmnibox{"QueryInOmnibox",
 // 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_ENABLED_BY_DEFAULT};
+  "OmniboxUIExperimentShowSuggestionFavicons",
+#if defined(OS_ANDROID)
+      base::FEATURE_DISABLED_BY_DEFAULT
+#else
+      base::FEATURE_ENABLED_BY_DEFAULT
+#endif
+};
 
 // Feature used to always swap the title and URL.
 const base::Feature kUIExperimentSwapTitleAndUrl{