Add SharingHub to fieldtrial testing config

Bug: 1009124
Change-Id: I0d15bfdff9fe26177297ba3fe799567ec595d2ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2327646Reviewed-by: Eric Willigers <ericwilligers@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801495}

chrome/android/javatests/src/org/chromium/chrome/browser/webshare/WebShareTest.java

@@ -25,12 +25,14 @@ import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.chrome.browser.app.ChromeActivity;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.share.ShareHelper;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.content_public.browser.test.NativeLibraryTestUtils;
 import org.chromium.content_public.browser.test.util.TouchCommon;
 import org.chromium.net.test.EmbeddedTestServer;
@@ -133,6 +135,7 @@ public class WebShareTest {
     @Test
     @MediumTest
     @Feature({"WebShare"})
+    @Features.DisableFeatures(ChromeFeatureList.CHROME_SHARING_HUB)
     @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
     public void testWebShareCancel() throws Exception {
         // Set up ShareHelper to ignore the intent (without showing a picker). This simulates the
@@ -153,6 +156,7 @@ public class WebShareTest {
     @Test
     @MediumTest
     @Feature({"WebShare"})
+    @Features.DisableFeatures(ChromeFeatureList.CHROME_SHARING_HUB)
     @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
     public void testWebShareSuccess() throws Exception {
         // Set up ShareHelper to immediately succeed (without showing a picker).
@@ -178,6 +182,7 @@ public class WebShareTest {
     @Test
     @MediumTest
     @Feature({"WebShare"})
+    @Features.DisableFeatures(ChromeFeatureList.CHROME_SHARING_HUB)
     @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
     public void testWebShareOgg() throws Exception {
         // Set up ShareHelper to immediately succeed (without showing a picker).
@@ -203,6 +208,7 @@ public class WebShareTest {
     @Test
     @MediumTest
     @Feature({"WebShare"})
+    @Features.DisableFeatures(ChromeFeatureList.CHROME_SHARING_HUB)
     @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
     public void testWebShareBmp() throws Exception {
         // Set up ShareHelper to immediately succeed (without showing a picker).
@@ -292,6 +298,7 @@ public class WebShareTest {
     @Test
     @MediumTest
     @Feature({"WebShare"})
+    @Features.DisableFeatures(ChromeFeatureList.CHROME_SHARING_HUB)
     public void testWebShareCancelPreLMR1() throws Exception {
         ShareHelper.setFakeIntentReceiverForTesting(new FakeIntentReceiverPreLMR1(false));
 
@@ -313,6 +320,7 @@ public class WebShareTest {
     @Test
     @MediumTest
     @Feature({"WebShare"})
+    @Features.DisableFeatures(ChromeFeatureList.CHROME_SHARING_HUB)
     public void testWebShareSuccessPreLMR1() throws Exception {
         ShareHelper.setFakeIntentReceiverForTesting(new FakeIntentReceiverPreLMR1(true));
 
@@ -334,6 +342,7 @@ public class WebShareTest {
     @Test
     @MediumTest
     @Feature({"WebShare"})
+    @Features.DisableFeatures(ChromeFeatureList.CHROME_SHARING_HUB)
     public void testWebShareOggPreLMR1() throws Exception {
         ShareHelper.setFakeIntentReceiverForTesting(new FakeIntentReceiverPreLMR1(true));
 
@@ -356,6 +365,7 @@ public class WebShareTest {
     @Test
     @MediumTest
     @Feature({"WebShare"})
+    @Features.DisableFeatures(ChromeFeatureList.CHROME_SHARING_HUB)
     public void testWebShareCsvPreLMR1() throws Exception {
         ShareHelper.setFakeIntentReceiverForTesting(new FakeIntentReceiverPreLMR1(true));
 

testing/variations/fieldtrial_testing_config.json

@@ -1220,6 +1220,22 @@
             ]
         }
     ],
+    "ChromeSharingHubClank": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "ChromeShareQRCode",
+                        "ChromeSharingHub"
+                    ]
+                }
+            ]
+        }
+    ],
     "ChromeSmartSelection": [
         {
             "platforms": [