Add Interest Feed V2 to fieldtrial config.

Change-Id: I637a52d02bb62195efcfad0bff41aa47afb6eaea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410649Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
Reviewed-by: Dan H <harringtond@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808458}

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedAppLifecycleTest.java

@@ -46,6 +46,7 @@ import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
+import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.components.user_prefs.UserPrefs;
@@ -62,6 +63,7 @@ import java.util.concurrent.TimeoutException;
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)
+@DisableFeatures({ChromeFeatureList.INTEREST_FEED_V2})
 public class FeedAppLifecycleTest {
     @Rule
     public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
@@ -152,7 +154,6 @@ public class FeedAppLifecycleTest {
     @Test
     @SmallTest
     @Feature({"Feed"})
-    @EnableFeatures({ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS})
     public void testNtpOpeningTriggersInitializeOnlyOnce() {
         // We open to about:blank initially so we shouldn't have called initialize() yet.
         verify(mAppLifecycleListener, times(0)).initialize();

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedContentStorageConformanceTest.java

@@ -18,9 +18,11 @@ import org.chromium.chrome.browser.feed.library.api.host.storage.CommitResult;
 import org.chromium.chrome.browser.feed.library.api.host.storage.ContentMutation;
 import org.chromium.chrome.browser.feed.library.common.Result;
 import org.chromium.chrome.browser.feed.library.testing.conformance.storage.ContentStorageConformanceTest;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 
 import java.util.List;
@@ -35,6 +37,7 @@ import java.util.Map;
 // build/android/test_runner.py.
 @SmallTest
 @RunWith(ChromeJUnit4ClassRunner.class)
+@DisableFeatures({ChromeFeatureList.INTEREST_FEED_V2})
 public final class FeedContentStorageConformanceTest extends ContentStorageConformanceTest {
     private static final long TIMEOUT = scaleTimeout(3000);
 

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedJournalStorageConformanceTest.java

@@ -18,9 +18,11 @@ import org.chromium.chrome.browser.feed.library.api.host.storage.CommitResult;
 import org.chromium.chrome.browser.feed.library.api.host.storage.JournalMutation;
 import org.chromium.chrome.browser.feed.library.common.Result;
 import org.chromium.chrome.browser.feed.library.testing.conformance.storage.JournalStorageConformanceTest;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 
 import java.util.List;
@@ -34,6 +36,7 @@ import java.util.List;
 // build/android/test_runner.py.
 @SmallTest
 @RunWith(ChromeJUnit4ClassRunner.class)
+@DisableFeatures({ChromeFeatureList.INTEREST_FEED_V2})
 public final class FeedJournalStorageConformanceTest extends JournalStorageConformanceTest {
     private static final long TIMEOUT = scaleTimeout(3000);
 

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedNetworkBridgeConformanceTest.java

@@ -22,9 +22,11 @@ import org.chromium.base.Log;
 import org.chromium.chrome.browser.feed.library.api.host.network.HttpRequest;
 import org.chromium.chrome.browser.feed.library.api.host.network.HttpResponse;
 import org.chromium.chrome.browser.feed.library.testing.conformance.network.NetworkClientConformanceTest;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.net.test.EmbeddedTestServer;
 
@@ -40,6 +42,7 @@ import java.util.concurrent.TimeUnit;
 // the inherited @Test methods to run using build/android/test_runner.py
 @SmallTest
 @RunWith(ChromeJUnit4ClassRunner.class)
+@DisableFeatures({ChromeFeatureList.INTEREST_FEED_V2})
 public final class FeedNetworkBridgeConformanceTest extends NetworkClientConformanceTest {
     private static final String TAG = "FeedConformanceTest";
     private static final long TIMEOUT = scaleTimeout(3000);

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedNewTabPageCardRenderTest.java

@@ -58,7 +58,8 @@ import java.util.List;
         "disable-features=IPH_FeedHeaderMenu"})
 @Features.EnableFeatures({ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS,
     ChromeFeatureList.OMNIBOX_SEARCH_ENGINE_LOGO})
-@Features.DisableFeatures({ChromeFeatureList.REPORT_FEED_USER_ACTIONS, ChromeFeatureList.QUERY_TILES})
+@Features.DisableFeatures({ChromeFeatureList.REPORT_FEED_USER_ACTIONS,
+    ChromeFeatureList.QUERY_TILES, ChromeFeatureList.INTEREST_FEED_V2})
 public class FeedNewTabPageCardRenderTest {
     // clang-format on
     private static final String TEST_FEED_DATA_BASE_PATH = "/chrome/test/data/android/feed/";

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedNewTabPageTest.java

@@ -192,6 +192,7 @@ public class FeedNewTabPageTest {
     @Test
     @MediumTest
     @Feature({"FeedNewTabPage"})
+    @Features.DisableFeatures(ChromeFeatureList.INTEREST_FEED_V2)
     public void testSignInPromo() {
         openNewTabPage();
         SignInPromo.SigninObserver signinObserver = mNtp.getCoordinatorForTesting()
@@ -302,6 +303,7 @@ public class FeedNewTabPageTest {
     @Test
     @MediumTest
     @Features.EnableFeatures(ChromeFeatureList.REPORT_FEED_USER_ACTIONS)
+    @Features.DisableFeatures(ChromeFeatureList.INTEREST_FEED_V2)
     @Feature({"NewTabPage", "FeedNewTabPage"})
     @ParameterAnnotations.UseMethodParameter(SigninPromoParams.class)
     public void testArticleSectionHeaderWithMenu(boolean disableSigninPromoCard) throws Exception {

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedRefreshTaskTest.java

@@ -19,7 +19,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
-import org.chromium.chrome.test.util.browser.Features;
+import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
+import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
 import org.chromium.components.background_task_scheduler.BackgroundTaskScheduler;
 import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
 import org.chromium.components.background_task_scheduler.TaskIds;
@@ -36,7 +37,8 @@ import java.util.List;
 // clang-format off
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)
-@Features.EnableFeatures(ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS)
+@EnableFeatures(ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS)
+@DisableFeatures({ChromeFeatureList.INTEREST_FEED_V2})
 public class FeedRefreshTaskTest {
     // clang-format on
 

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedSchedulerBridgeConformanceTest.java

@@ -18,9 +18,11 @@ import org.chromium.base.test.params.ParameterSet;
 import org.chromium.base.test.params.ParameterizedRunner;
 import org.chromium.chrome.browser.feed.library.api.client.requestmanager.RequestManager;
 import org.chromium.chrome.browser.feed.library.testing.conformance.scheduler.SchedulerConformanceTest;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
+import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 
 import java.util.Arrays;
@@ -36,6 +38,7 @@ import java.util.List;
 @SmallTest
 @RunWith(ParameterizedRunner.class)
 @UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
+@DisableFeatures({ChromeFeatureList.INTEREST_FEED_V2})
 public final class FeedSchedulerBridgeConformanceTest extends SchedulerConformanceTest {
     @ClassParameter
     private static List<ParameterSet> sClassParams =

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoTest.java

@@ -260,6 +260,7 @@ public class HomepagePromoTest {
 
     @Test
     @SmallTest
+    @Features.DisableFeatures({ChromeFeatureList.INTEREST_FEED_V2})
     public void testToggleFeed_WithSignIn() {
         // Test to toggle stream when HomepagePromo is hide. Toggle feed should hide promo still.
         launchNewTabPage();

testing/variations/fieldtrial_testing_config.json

@@ -3857,6 +3857,21 @@
             ]
         }
     ],
+    "InterestFeedV2": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "InterestFeedV2"
+                    ]
+                }
+            ]
+        }
+    ],
     "IsolatePasswordSites": [
         {
             "platforms": [