Cancel dialog animation when immediate tab model selection happens

When user clicks on top tool bar toggle to switch between incognito/
normal mode right after the dialog animation starts, the animation
continues and the dialog shows up while the tab model has already
changed which causes dialog malfunction. This CL fixes this issue.

Bug: 987227
Change-Id: I0e47119ed19627f4227e183454276dbdc5c2db06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717325Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Yue Zhang <yuezhanggg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681330}

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

@@ -174,6 +174,7 @@ class GridTabSwitcherMediator implements GridTabSwitcher.GridController,
                         mTabModelSelector.getTabModelFilterProvider().getCurrentTabModelFilter();
                 mResetHandler.resetWithTabList(currentTabModelFilter, false);
                 mContainerViewModel.set(IS_INCOGNITO, currentTabModelFilter.isIncognito());
+                mTabGridDialogResetHandler.hideDialog(false);
             }
         };
         mTabModelSelector.addObserver(mTabModelSelectorObserver);

chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/GridTabSwitcherMediatorUnitTest.java

@@ -113,6 +113,8 @@ public class GridTabSwitcherMediatorUnitTest {
     CompositorViewHolder mCompositorViewHolder;
     @Mock
     Layout mLayout;
+    @Mock
+    TabGridDialogMediator.ResetHandler mTabGridDialogResetHandler;
 
     @Captor
     ArgumentCaptor<TabModelObserver> mTabModelObserverCaptor;
@@ -180,6 +182,7 @@ public class GridTabSwitcherMediatorUnitTest {
                 mFullscreenManager, mCompositorViewHolder, null);
         mMediator.addOverviewModeObserver(mOverviewModeObserver);
         mMediator.setOnTabSelectingListener(mLayout::onTabSelecting);
+        mMediator.setTabGridDialogResetHandler(mTabGridDialogResetHandler);
     }
 
     @After
@@ -273,6 +276,7 @@ public class GridTabSwitcherMediatorUnitTest {
                 mModel.get(TabListContainerProperties.ANIMATE_VISIBILITY_CHANGES), equalTo(true));
         assertThat(mModel.get(TabListContainerProperties.IS_VISIBLE), equalTo(false));
         assertThat(mMediator.overviewVisible(), equalTo(false));
+        verify(mTabGridDialogResetHandler).hideDialog(eq(false));
     }
 
     @Test
@@ -298,6 +302,7 @@ public class GridTabSwitcherMediatorUnitTest {
                 mModel.get(TabListContainerProperties.ANIMATE_VISIBILITY_CHANGES), equalTo(true));
         assertThat(mModel.get(TabListContainerProperties.IS_VISIBLE), equalTo(false));
         assertThat(mMediator.overviewVisible(), equalTo(false));
+        verify(mTabGridDialogResetHandler).hideDialog(eq(false));
     }
 
     @Test
@@ -345,6 +350,7 @@ public class GridTabSwitcherMediatorUnitTest {
         doReturn(true).when(mTabModelFilter).isIncognito();
         mTabModelSelectorObserverCaptor.getValue().onTabModelSelected(mTabModel, null);
         verify(mResetHandler).resetWithTabList(eq(mTabModelFilter), eq(false));
+        verify(mTabGridDialogResetHandler).hideDialog(eq(false));
         assertThat(mModel.get(TabListContainerProperties.IS_INCOGNITO), equalTo(true));
 
         // Switching TabModels by itself shouldn't cause visibility changes.