Duet: Delete TabGroupPopupUi code

TabGroupPopupUi-related classes are introduced for TabGroup and Duet.
This CL deletes them as Duet was sunset.

Bug: 1081343
Change-Id: I24cabbce1feb4b8aa87a8eed6f05b6e2812558c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404285Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Yue Zhang <yuezhanggg@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806341}

chrome/android/DEPS

@@ -74,7 +74,7 @@ specific_include_rules = {
   ],
 
   # Tests and test-oriented classes are allowed to rely on ChromeActivity for DEPS. When committing
-  # a file that doesn't conform to these patterns, add an allow rule to the DEPS file to the 
+  # a file that doesn't conform to these patterns, add an allow rule to the DEPS file to the
   # testing directory.
   ".*Test\.java": [
     "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
@@ -131,12 +131,6 @@ specific_include_rules = {
   "TasksSurfaceCoordinator\.java": [
     "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
   ],
-  "TabGroupPopupUi\.java": [
-    "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
-  ],
-  "TabGroupPopupUiCoordinator\.java": [
-    "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
-  ],
   "TabGroupUi\.java": [
     "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
   ],

chrome/android/features/tab_ui/BUILD.gn

@@ -130,11 +130,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiMediator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiParent.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiProperties.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditor.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java",

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

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.tasks.tab_management;
-
-import android.view.View;
-
-import org.chromium.chrome.browser.app.ChromeActivity;
-
-/**
- * Interface for the popup TabGroup UI.
- */
-public interface TabGroupPopupUi {
-    void initializeWithNative(ChromeActivity activity);
-
-    View.OnLongClickListener getLongClickListenerForTriggering();
-
-    void destroy();
-}

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

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.tasks.tab_management;
-
-import android.view.View;
-
-import org.chromium.base.Callback;
-import org.chromium.base.supplier.ObservableSupplier;
-import org.chromium.chrome.browser.ThemeColorProvider;
-import org.chromium.chrome.browser.app.ChromeActivity;
-import org.chromium.chrome.browser.lifecycle.Destroyable;
-import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerProvider;
-import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-
-/**
- * A coordinator for TabStrip component as a popup window in bottom toolbar.
- */
-public class TabGroupPopupUiCoordinator
-        implements TabGroupPopupUi, Destroyable, TabGroupPopupUiMediator.TabGroupPopUiUpdater {
-    private final ThemeColorProvider mThemeColorProvider;
-    private final ObservableSupplier<View> mAnchorViewSupplier;
-    private final Callback<View> mAnchorViewSupplierCallback;
-
-    private PropertyModelChangeProcessor mModelChangeProcessor;
-    private View mAnchorView;
-    private TabGroupUiCoordinator mTabGroupUiCoordinator;
-    private TabGroupPopupUiMediator mMediator;
-    private TabGroupPopupUiParent mTabGroupPopupUiParent;
-
-    TabGroupPopupUiCoordinator(
-            ThemeColorProvider themeColorProvider, ObservableSupplier<View> parentViewSupplier) {
-        mThemeColorProvider = themeColorProvider;
-        mAnchorViewSupplier = parentViewSupplier;
-        mAnchorViewSupplierCallback = this::onAnchorViewChanged;
-        mAnchorViewSupplier.addObserver(mAnchorViewSupplierCallback);
-    }
-
-    // TabGroupPopUi implementation.
-    @Override
-    // TODO(crbug.com/1022827): Narrow down the dependencies required here and in
-    // TabGroupUiCoordinator instead of passing in ChromeActivity.
-    public void initializeWithNative(ChromeActivity activity) {
-        PropertyModel model = new PropertyModel(TabGroupPopupUiProperties.ALL_KEYS);
-        mTabGroupPopupUiParent = new TabGroupPopupUiParent(activity, mAnchorView);
-        mTabGroupUiCoordinator = new TabGroupUiCoordinator(
-                mTabGroupPopupUiParent.getCurrentContainerView(), mThemeColorProvider, null);
-        mTabGroupUiCoordinator.initializeWithNative(activity, null);
-        mModelChangeProcessor = PropertyModelChangeProcessor.create(
-                model, mTabGroupPopupUiParent, TabGroupPopupUiViewBinder::bind);
-        mMediator = new TabGroupPopupUiMediator(model, activity.getTabModelSelector(),
-                activity.getOverviewModeBehaviorSupplier(), activity.getBrowserControlsManager(),
-                this, mTabGroupUiCoordinator,
-                BottomSheetControllerProvider.from(activity.getWindowAndroid()));
-        mMediator.onAnchorViewChanged(mAnchorView, mAnchorView.getId());
-    }
-
-    @Override
-    public View.OnLongClickListener getLongClickListenerForTriggering() {
-        return v -> {
-            mMediator.maybeShowTabStrip();
-            return true;
-        };
-    }
-
-    /**
-     * Destroy any members that needs clean up.
-     */
-    @Override
-    public void destroy() {
-        if (mMediator != null) {
-            mMediator.destroy();
-        }
-        if (mModelChangeProcessor != null) {
-            mModelChangeProcessor.destroy();
-        }
-        if (mTabGroupUiCoordinator != null) {
-            mTabGroupUiCoordinator.destroy();
-        }
-        mAnchorViewSupplier.removeObserver(mAnchorViewSupplierCallback);
-    }
-
-    // TabGroupPopUiUpdater implementation.
-    @Override
-    public void updateTabGroupPopUi() {
-        mTabGroupPopupUiParent.updateStripWindow();
-    }
-
-    private void onAnchorViewChanged(View anchorView) {
-        if (mAnchorView == anchorView) return;
-        mAnchorView = anchorView;
-        if (mMediator == null) return;
-        mMediator.onAnchorViewChanged(anchorView, anchorView.getId());
-    }
-}

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

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.tasks.tab_management;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Handler;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.VisibleForTesting;
-
-import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.chrome.tab_ui.R;
-import org.chromium.ui.widget.AnchoredPopupWindow;
-import org.chromium.ui.widget.ViewRectProvider;
-
-/**
- * Parent for TabGroupPopUi component.
- */
-public class TabGroupPopupUiParent {
-    private final Context mContext;
-    private final float mIconSize;
-
-    private AnchoredPopupWindow mTopPopupWindow;
-    private ViewGroup mTopStripContainerView;
-    private AnchoredPopupWindow mBottomPopupWindow;
-    private ViewGroup mBottomStripContainerView;
-    private AnchoredPopupWindow mCurrentPopupWindow;
-    private ViewGroup mCurrentStripContainerView;
-    private boolean mIsShowingTopToolbar;
-
-    TabGroupPopupUiParent(Context context, View anchorView) {
-        mContext = context;
-        mIconSize = context.getResources().getDimension(R.dimen.infobar_big_icon_size);
-        onAnchorViewChanged(anchorView, anchorView.getId());
-    }
-
-    void onAnchorViewChanged(View anchorView, int anchorViewId) {
-        ViewGroup previousContainerView = mCurrentStripContainerView;
-        mIsShowingTopToolbar = anchorViewId == R.id.toolbar;
-
-        if (mIsShowingTopToolbar) {
-            if (mTopPopupWindow == null) {
-                mTopStripContainerView = new FrameLayout(mContext);
-                mTopPopupWindow = createTabGroupPopUi(anchorView, true);
-            }
-            mCurrentPopupWindow = mTopPopupWindow;
-            mCurrentStripContainerView = mTopStripContainerView;
-        } else {
-            if (mBottomPopupWindow == null) {
-                mBottomStripContainerView = new FrameLayout(mContext);
-                mBottomPopupWindow = createTabGroupPopUi(anchorView, false);
-            }
-            mCurrentPopupWindow = mBottomPopupWindow;
-            mCurrentStripContainerView = mBottomStripContainerView;
-        }
-
-        if (previousContainerView == null) return;
-        // Transfer the ownership of the tab strip view.
-        View contentView = previousContainerView.getChildAt(0);
-        assert contentView != null;
-        previousContainerView.removeViewAt(0);
-        mCurrentStripContainerView.addView(contentView);
-    }
-
-    private AnchoredPopupWindow createTabGroupPopUi(View anchorView, boolean isTop) {
-        ViewGroup stripContainerView = isTop ? mTopStripContainerView : mBottomStripContainerView;
-        assert stripContainerView != null;
-        ViewRectProvider rectProvider = new ViewRectProvider(anchorView);
-
-        AnchoredPopupWindow popupWindow = new AnchoredPopupWindow(mContext, anchorView,
-                ApiCompatibilityUtils.getDrawable(
-                        mContext.getResources(), R.drawable.popup_bg_tinted),
-                stripContainerView, rectProvider) {
-            @Override
-            public void onRectHidden() {}
-        };
-        popupWindow.setHorizontalOverlapAnchor(true);
-        popupWindow.setOutsideTouchable(true);
-        popupWindow.setDismissOnTouchInteraction(false);
-        popupWindow.setFocusable(false);
-        popupWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        popupWindow.setPreferredVerticalOrientation(isTop
-                        ? AnchoredPopupWindow.VerticalOrientation.BELOW
-                        : AnchoredPopupWindow.VerticalOrientation.ABOVE);
-        stripContainerView.setBackground(ApiCompatibilityUtils.getDrawable(
-                mContext.getResources(), R.drawable.popup_bg_tinted));
-
-        if (isTop) {
-            rectProvider.setInsetPx(0, (int) mIconSize, 0, (int) mIconSize);
-        } else {
-            rectProvider.setInsetPx(0, (int) mIconSize / 2, 0, (int) mIconSize / 2);
-        }
-        return popupWindow;
-    }
-
-    void updateStripWindow() {
-        if (mCurrentPopupWindow == null) return;
-        Handler handler = new Handler();
-        handler.post(() -> mCurrentPopupWindow.onRectChanged());
-    }
-
-    void setVisibility(boolean isVisible) {
-        if (isVisible) {
-            mCurrentPopupWindow.show();
-        } else {
-            mCurrentPopupWindow.dismiss();
-        }
-    }
-
-    ViewGroup getCurrentContainerView() {
-        assert mCurrentStripContainerView != null;
-        return mCurrentStripContainerView;
-    }
-
-    void setContentViewAlpha(float alpha) {
-        if (mCurrentStripContainerView == null) return;
-        mCurrentStripContainerView.setAlpha(alpha);
-    }
-
-    @VisibleForTesting
-    AnchoredPopupWindow getCurrentPopupWindowForTesting() {
-        return mCurrentPopupWindow;
-    }
-
-    @VisibleForTesting
-    ViewGroup getCurrentStripContainerViewForTesting() {
-        return getCurrentContainerView();
-    }
-
-    @VisibleForTesting
-    ViewGroup getTopStripContainerViewForTesting() {
-        return mTopStripContainerView;
-    }
-
-    @VisibleForTesting
-    ViewGroup getBottomStripContainerViewForTesting() {
-        return mBottomStripContainerView;
-    }
-}
\ No newline at end of file

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

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.tasks.tab_management;
-
-import android.view.View;
-
-import org.chromium.ui.modelutil.PropertyKey;
-import org.chromium.ui.modelutil.PropertyModel;
-
-/**
- * {@link PropertyKey} list for the TabGroupPopupUi.
- */
-class TabGroupPopupUiProperties {
-    public static final PropertyModel.WritableBooleanPropertyKey IS_VISIBLE =
-            new PropertyModel.WritableBooleanPropertyKey();
-    public static final PropertyModel.WritableObjectPropertyKey<View> ANCHOR_VIEW =
-            new PropertyModel.WritableObjectPropertyKey<>();
-    public static final PropertyModel.WritableFloatPropertyKey CONTENT_VIEW_ALPHA =
-            new PropertyModel.WritableFloatPropertyKey();
-
-    public static final PropertyKey[] ALL_KEYS =
-            new PropertyKey[] {IS_VISIBLE, ANCHOR_VIEW, CONTENT_VIEW_ALPHA};
-}

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

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.tasks.tab_management;
-
-import static org.chromium.chrome.browser.tasks.tab_management.TabGroupPopupUiProperties.ANCHOR_VIEW;
-import static org.chromium.chrome.browser.tasks.tab_management.TabGroupPopupUiProperties.CONTENT_VIEW_ALPHA;
-import static org.chromium.chrome.browser.tasks.tab_management.TabGroupPopupUiProperties.IS_VISIBLE;
-
-import android.view.View;
-
-import org.chromium.ui.modelutil.PropertyKey;
-import org.chromium.ui.modelutil.PropertyModel;
-
-/**
- * ViewBinder for TabGroupPopupUi.
- */
-class TabGroupPopupUiViewBinder {
-    /**
-     * Binds the given model to the given view, updating the payload in propertyKey.
-     *
-     * @param model       The model to use.
-     * @param view        The view to use.
-     * @param propertyKey The key for the property to update for.
-     */
-    public static void bind(
-            PropertyModel model, TabGroupPopupUiParent view, PropertyKey propertyKey) {
-        if (IS_VISIBLE == propertyKey) {
-            view.setVisibility(model.get(IS_VISIBLE));
-        } else if (CONTENT_VIEW_ALPHA == propertyKey) {
-            view.setContentViewAlpha(model.get(CONTENT_VIEW_ALPHA));
-        } else if (ANCHOR_VIEW == propertyKey) {
-            View anchorView = model.get(ANCHOR_VIEW);
-            view.onAnchorViewChanged(anchorView, anchorView.getId());
-        }
-    }
-}

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

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.tasks.tab_management;
 
 import android.content.Context;
-import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.IntDef;
@@ -128,14 +127,4 @@ public interface TabManagementDelegate {
      * @return the {@link TabSuggestions} for the activity
      */
     TabSuggestions createTabSuggestions(ChromeActivity activity);
-
-    /**
-     * Create the {@link TabGroupPopupUi}.
-     * @param themeColorProvider The {@link ThemeColorProvider} for this UI.
-     * @param parentViewSupplier The {@link ObservableSupplier} that provides parent view of this
-     *         component.
-     * @return The {@link TabGroupPopupUi}.
-     */
-    TabGroupPopupUi createTabGroupPopUi(
-            ThemeColorProvider themeColorProvider, ObservableSupplier<View> parentViewSupplier);
 }

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

@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.tasks.tab_management;
 import static org.chromium.chrome.browser.tasks.tab_management.TabManagementModuleProvider.SYNTHETIC_TRIAL_POSTFIX;
 
 import android.content.Context;
-import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.SysUtils;
@@ -108,10 +107,4 @@ public class TabManagementDelegateImpl implements TabManagementDelegate {
         return new TabSuggestionsOrchestrator(
                 activity.getTabModelSelector(), activity.getLifecycleDispatcher());
     }
-
-    @Override
-    public TabGroupPopupUi createTabGroupPopUi(
-            ThemeColorProvider themeColorProvider, ObservableSupplier<View> parentViewSupplier) {
-        return new TabGroupPopupUiCoordinator(themeColorProvider, parentViewSupplier);
-    }
 }

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

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.tasks.tab_management;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.test.filters.SmallTest;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.chromium.base.test.UiThreadTest;
-import org.chromium.chrome.browser.toolbar.top.ToolbarPhone;
-import org.chromium.chrome.tab_ui.R;
-import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
-import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
-import org.chromium.ui.widget.AnchoredPopupWindow;
-
-/**
- * Tests for {@link TabGroupPopupUiViewBinder}.
- */
-@RunWith(ChromeJUnit4ClassRunner.class)
-public class TabGroupPopupUiViewBinderTest extends DummyUiActivityTestCase {
-    private ToolbarPhone mTopAnchorView;
-    private FrameLayout mBottomAnchorView;
-    private TabGroupPopupUiParent mParent;
-
-    private PropertyModel mModel;
-    private PropertyModelChangeProcessor mMCP;
-
-    @Override
-    public void setUpTest() throws Exception {
-        super.setUpTest();
-
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mTopAnchorView = new ToolbarPhone(getActivity(), null);
-            mTopAnchorView.setId(R.id.toolbar);
-            mBottomAnchorView = new FrameLayout(getActivity());
-            mParent = new TabGroupPopupUiParent(getActivity(), mTopAnchorView);
-
-            mModel = new PropertyModel(TabGroupPopupUiProperties.ALL_KEYS);
-            mMCP = PropertyModelChangeProcessor.create(
-                    mModel, mParent, TabGroupPopupUiViewBinder::bind);
-        });
-    }
-
-    @Override
-    public void tearDownTest() throws Exception {
-        TestThreadUtils.runOnUiThreadBlocking(mMCP::destroy);
-        super.tearDownTest();
-    }
-
-    @Test
-    @UiThreadTest
-    @SmallTest
-    public void testSetVisibility() {
-        AnchoredPopupWindow popupWindow = mParent.getCurrentPopupWindowForTesting();
-        assertNotNull(popupWindow);
-        assertFalse(popupWindow.isShowing());
-
-        mModel.set(TabGroupPopupUiProperties.IS_VISIBLE, true);
-        assertTrue(popupWindow.isShowing());
-
-        mModel.set(TabGroupPopupUiProperties.IS_VISIBLE, false);
-        assertFalse(popupWindow.isShowing());
-    }
-
-    @Test
-    @UiThreadTest
-    @SmallTest
-    public void testSetContentViewAlpha() {
-        ViewGroup containerView = mParent.getCurrentStripContainerViewForTesting();
-        assertNotNull(containerView);
-        assertEquals(1f, containerView.getAlpha(), 0);
-
-        mModel.set(TabGroupPopupUiProperties.CONTENT_VIEW_ALPHA, 0.5f);
-        assertEquals(0.5f, containerView.getAlpha(), 0);
-
-        mModel.set(TabGroupPopupUiProperties.CONTENT_VIEW_ALPHA, 0.25f);
-        assertEquals(0.25f, containerView.getAlpha(), 0);
-    }
-
-    @Test
-    @UiThreadTest
-    @SmallTest
-    public void testSetAnchorView() {
-        ViewGroup topContainerView;
-        ViewGroup bottomContainerView;
-
-        // Assume initial anchor view is top toolbar, and components for bottom toolbar is not
-        // initialized.
-        topContainerView = mParent.getTopStripContainerViewForTesting();
-        bottomContainerView = mParent.getBottomStripContainerViewForTesting();
-        assertEquals(topContainerView, mParent.getCurrentStripContainerViewForTesting());
-        assertNull(bottomContainerView);
-
-        // Create a dummy view representing the strip component and add it to the current container
-        // view.
-        FrameLayout contentView = new FrameLayout(getActivity());
-        mParent.getCurrentStripContainerViewForTesting().addView(contentView);
-
-        // Change anchor view from the top toolbar to the bottom toolbar.
-        mModel.set(TabGroupPopupUiProperties.ANCHOR_VIEW, mBottomAnchorView);
-
-        // Check that components related to bottom anchor view are initialized. Also, the ownership
-        // of the content view should be given to the bottom strip container.
-        topContainerView = mParent.getTopStripContainerViewForTesting();
-        bottomContainerView = mParent.getBottomStripContainerViewForTesting();
-        assertNotNull(bottomContainerView);
-        assertEquals(bottomContainerView, mParent.getCurrentStripContainerViewForTesting());
-        assertEquals(0, topContainerView.getChildCount());
-        assertEquals(1, bottomContainerView.getChildCount());
-        assertEquals(contentView, bottomContainerView.getChildAt(0));
-
-        // Change anchor view from the bottom toolbar to the top toolbar.
-        mModel.set(TabGroupPopupUiProperties.ANCHOR_VIEW, mTopAnchorView);
-
-        // Check the ownership of the content view should be given back to top strip container.
-        topContainerView = mParent.getTopStripContainerViewForTesting();
-        bottomContainerView = mParent.getBottomStripContainerViewForTesting();
-        assertNotNull(topContainerView);
-        assertNotNull(bottomContainerView);
-        assertEquals(topContainerView, mParent.getCurrentStripContainerViewForTesting());
-        assertEquals(1, topContainerView.getChildCount());
-        assertEquals(0, bottomContainerView.getChildCount());
-        assertEquals(contentView, topContainerView.getChildAt(0));
-    }
-}

chrome/android/features/tab_ui/tab_management_java_sources.gni

@@ -13,7 +13,6 @@ public_tab_management_java_sources = [
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCache.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/EmptyTabGroupModelFilterObserver.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java",
-  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUi.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUi.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegate.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementModuleProvider.java",
@@ -43,7 +42,6 @@ tab_management_test_java_sources = [
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java",
-  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java",
@@ -70,7 +68,6 @@ tab_management_junit_java_sources = [
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallbackUnitTest.java",
-  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java",