[Signin][Android] Enable MobileIdentityConsistency in testing config

Adds MobileIdentityConsistency to
testing/variations/fieldtrial_testing_config.json and adds explicit
@DisableFeatures to the affected tests.

Bug: 1128916, 1142467
Change-Id: I25afb6de05d2ce232f1006a8497884f9db18d52e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489895
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Auto-Submit: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820973}

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

@@ -150,6 +150,7 @@ public class NewTabPageTest {
     @Test
     @MediumTest
     @Feature({"NewTabPage", "FeedNewTabPage", "RenderTest"})
+    @Features.DisableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
     public void testRender_FocusFakeBox() throws Exception {
         ScrimCoordinator scrimCoordinator = mActivityTestRule.getActivity()
                                                     .getRootUiCoordinatorForTesting()
@@ -164,6 +165,7 @@ public class NewTabPageTest {
     @Test
     @SmallTest
     @Feature({"NewTabPage", "FeedNewTabPage", "RenderTest"})
+    @Features.DisableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
     public void testRender_SignInPromo() throws Exception {
         // Scroll to the sign in promo in case it is not visible.
         onView(instanceOf(RecyclerView.class))

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/RecentTabsPageTest.java

@@ -99,6 +99,7 @@ public class RecentTabsPageTest {
     @Test
     @LargeTest
     @Feature("RenderTest")
+    @Features.DisableFeatures({ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY})
     public void testPersonalizedSigninPromoInRecentTabsPage() throws Exception {
         mAccountManagerTestRule.addAccount(mAccountManagerTestRule.createProfileDataFromName(
                 AccountManagerTestRule.TEST_ACCOUNT_EMAIL));

chrome/android/javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java

@@ -165,8 +165,10 @@ public class MainSettingsFragmentTest {
     @LargeTest
     @Feature({"RenderTest"})
     @EnableFeatures({ChromeFeatureList.SAFE_BROWSING_SECTION_UI})
-    @DisableFeatures({ChromeFeatureList.SAFETY_CHECK_ANDROID})
-    public void testRenderDifferentSignedInStates() throws IOException {
+    @DisableFeatures(
+            {ChromeFeatureList.SAFETY_CHECK_ANDROID, ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY})
+    public void
+    testRenderDifferentSignedInStates() throws IOException {
         launchSettingsActivity();
         View view = mSettingsActivityTestRule.getActivity()
                             .findViewById(android.R.id.content)
@@ -184,6 +186,7 @@ public class MainSettingsFragmentTest {
     @Feature({"RenderTest"})
     @EnableFeatures(
             {ChromeFeatureList.SAFETY_CHECK_ANDROID, ChromeFeatureList.SAFE_BROWSING_SECTION_UI})
+    @DisableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
     public void
     testRenderDifferentSignedInStatesWithSafetyCheck() throws IOException {
         launchSettingsActivity();
@@ -207,6 +210,7 @@ public class MainSettingsFragmentTest {
     @Test
     @SmallTest
     @EnableFeatures({ChromeFeatureList.PASSWORD_CHECK, ChromeFeatureList.SAFETY_CHECK_ANDROID})
+    @DisableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
     public void testStartup() {
         launchSettingsActivity();
 
@@ -367,6 +371,7 @@ public class MainSettingsFragmentTest {
      */
     @Test
     @SmallTest
+    @DisableFeatures({ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY})
     public void testAccountSignIn() {
         launchSettingsActivity();
 

testing/variations/fieldtrial_testing_config.json

@@ -4372,6 +4372,21 @@
             ]
         }
     ],
+    "MobileIdentityConsistency": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "MobileIdentityConsistency"
+                    ]
+                }
+            ]
+        }
+    ],
     "MyChromeEverywhere": [
         {
             "platforms": [