Reset feature flags in tearDown for tests in tab_ui

Bug: None
Change-Id: I936e72faad21a0bb707c9f9e545dfa78cce87eb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2029233
Commit-Queue: Yue Zhang <yuezhanggg@chromium.org>
Auto-Submit: Yue Zhang <yuezhanggg@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736913}

chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderTest.java

@@ -20,6 +20,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
@@ -136,6 +137,11 @@ public class MessageCardProviderTest extends DummyUiActivityTestCase {
         mCoordinator.subscribeMessageService(mSuggestionService);
     }
 
+    @After
+    public void tearDown() {
+        TabFeatureUtilities.setIsTabToGtsAnimationEnabledForTesting(null);
+    }
+
     @Test
     @SmallTest
     public void testShowingTabSuggestionMessage() {

chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParentTest.java

@@ -23,7 +23,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.chromium.chrome.browser.tab.TabFeatureUtilities;
 import org.chromium.chrome.tab_ui.R;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
@@ -51,7 +50,6 @@ public class TabGridDialogParentTest extends DummyUiActivityTestCase {
     @Override
     public void setUpTest() throws Exception {
         super.setUpTest();
-        TabFeatureUtilities.setIsTabToGtsAnimationEnabledForTesting(true);
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             mDummyParent = new FrameLayout(getActivity());

chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogTest.java

@@ -52,6 +52,7 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -110,6 +111,12 @@ public class TabGridDialogTest {
                                             .getCurrentTabModelFilter()::isTabModelRestored);
     }
 
+    @After
+    public void tearDown() {
+        FeatureUtilities.setGridTabSwitcherEnabledForTesting(null);
+        FeatureUtilities.setTabGroupsAndroidEnabledForTesting(null);
+    }
+
     @Test
     @MediumTest
     public void testBackPressCloseDialog() throws InterruptedException {

chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiTest.java

@@ -33,6 +33,7 @@ import android.support.test.filters.MediumTest;
 import android.view.View;
 import android.widget.FrameLayout;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -84,6 +85,13 @@ public class TabGroupPopupUiTest {
         FeatureUtilities.setDuetTabStripIntegrationAndroidEnabledForTesting(true);
     }
 
+    @After
+    public void tearDown() {
+        FeatureUtilities.setTabGroupsAndroidEnabledForTesting(null);
+        FeatureUtilities.setIsBottomToolbarEnabledForTesting(null);
+        FeatureUtilities.setDuetTabStripIntegrationAndroidEnabledForTesting(null);
+    }
+
     @Test
     @MediumTest
     public void testOnAnchorViewChanged_HOME_SEARCH_TAB_SWITCHER() throws InterruptedException {

chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java

@@ -265,6 +265,7 @@ public class TabListContainerViewBinderTest extends DummyUiActivityTestCase {
     @Override
     public void tearDownTest() throws Exception {
         mMCP.destroy();
+        FeatureUtilities.setGridTabSwitcherEnabledForTesting(null);
         super.tearDownTest();
     }
 }

chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorTest.java

@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.tasks.tab_management;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -69,6 +70,11 @@ public class TabSelectionEditorTest {
         });
     }
 
+    @After
+    public void tearDown() {
+        FeatureUtilities.setTabGroupsAndroidEnabledForTesting(null);
+    }
+
     @Test
     @MediumTest
     public void testShowTabs() {

chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMultiWindowTest.java

@@ -23,6 +23,7 @@ import android.support.test.filters.MediumTest;
 import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -78,6 +79,11 @@ public class TabSwitcherMultiWindowTest {
                         .getCurrentTabModelFilter()::isTabModelRestored));
     }
 
+    @After
+    public void tearDown() {
+        FeatureUtilities.setGridTabSwitcherEnabledForTesting(null);
+    }
+
     @Test
     @MediumTest
     @TargetApi(Build.VERSION_CODES.N)