Add field trial testing config for OmniboxSearchEngineLogoAndroid

Change-Id: I7b613853896b4090bf1cd00cdeb6d986c9add676
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1926807Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Brian White <bcwhite@chromium.org>
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720589}

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java

@@ -59,6 +59,7 @@ import org.chromium.chrome.test.util.OmniboxTestUtils.SuggestionsResult;
 import org.chromium.chrome.test.util.OmniboxTestUtils.SuggestionsResultBuilder;
 import org.chromium.chrome.test.util.OmniboxTestUtils.TestAutocompleteController;
 import org.chromium.chrome.test.util.OmniboxTestUtils.TestSuggestionResultsBuilder;
+import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.KeyUtils;
@@ -604,6 +605,7 @@ public class OmniboxTest {
     @Test
     @MediumTest
     @SkipCommandLineParameterization
+    @DisableFeatures("OmniboxSearchEngineLogo")
     public void testSecurityIconOnHTTP() {
         EmbeddedTestServer testServer =
                 EmbeddedTestServer.createAndStartServer(InstrumentationRegistry.getContext());

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/UrlBarIntegrationTest.java

@@ -30,6 +30,7 @@ import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.OmniboxTestUtils;
+import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
@@ -156,6 +157,8 @@ public class UrlBarIntegrationTest {
     @Test
     @SmallTest
     @Feature({"Omnibox"})
+    // TODO(crbug.com/1048469): Investigate and enable this test for the search engine logo feature.
+    @DisableFeatures("OmniboxSearchEngineLogo")
     @RetryOnFailure
     public void testLongPress() {
         // This is a more realistic test than HUGE_URL because ita's full of separator characters

testing/variations/fieldtrial_testing_config.json

@@ -4179,6 +4179,24 @@
             ]
         }
     ],
+    "OmniboxSearchEngineLogoAndroid": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "params": {
+                        "rounded_edges": "true"
+                    },
+                    "enable_features": [
+                        "OmniboxSearchEngineLogo"
+                    ]
+                }
+            ]
+        }
+    ],
     "OmniboxSteadyStateElisions": [
         {
             "platforms": [