Merge pull request #8138 from brave/androis_tab_groups_crash

[Android] Fixes crash on closing tabs with Tab Groups

Author: samartnik

android/java/apk_for_test.flags

@@ -103,6 +103,7 @@
     *** mTabModelSelector;
     *** mIncognitoStateProvider;
     *** mTabCountProvider;
+    *** mTabGroupUi;
     *** onOrientationChange(...);
     *** updateButtonStatus(...);
     *** updateBookmarkButtonStatus(...);

android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java

@@ -73,6 +73,7 @@
 import java.util.List;
 
 public class BraveToolbarManager extends ToolbarManager {
+    // To delete in bytecode, members from parent class will be used instead.
     private ObservableSupplierImpl<BottomControlsCoordinator> mBottomControlsCoordinatorSupplier;
     private CallbackController mCallbackController;
     private BrowserControlsSizer mBrowserControlsSizer;
@@ -94,15 +95,16 @@ public class BraveToolbarManager extends ToolbarManager {
     private TabModelSelector mTabModelSelector;
     private IncognitoStateProvider mIncognitoStateProvider;
     private TabCountProvider mTabCountProvider;
+    private TabGroupUi mTabGroupUi;
 
+    // Own members.
     private boolean mIsBottomToolbarVisible;
     private ObservableSupplier<Boolean> mOmniboxFocusStateSupplier;
     private OneshotSupplier<LayoutStateProvider> mLayoutStateProviderSupplier;
     private HomepageManager.HomepageStateListener mBraveHomepageStateListener;
     private AppCompatActivity mActivity;
     private WindowAndroid mWindowAndroid;
     private CompositorViewHolder mCompositorViewHolder;
-    private TabGroupUi mTabGroupUi;
 
     public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer controlsSizer,
             FullscreenManager fullscreenManager, ToolbarControlContainer controlContainer,
@@ -191,11 +193,6 @@ public void enableBottomControls() {
         updateBottomToolbarVisibility();
     }
 
-    @Override
-    public TabGroupUi getTabGroupUi() {
-        return mTabGroupUi;
-    }
-
     @Override
     public void initializeWithNative(LayoutManagerImpl layoutManager,
             OnClickListener tabSwitcherClickHandler, OnClickListener newTabClickHandler,

android/javatests/org/chromium/chrome/browser/BytecodeTest.java

@@ -326,6 +326,8 @@ public void testFieldsExist() throws Exception {
                 "org/chromium/chrome/browser/toolbar/ToolbarManager", "mIncognitoStateProvider"));
         Assert.assertTrue(fieldExists(
                 "org/chromium/chrome/browser/toolbar/ToolbarManager", "mTabCountProvider"));
+        Assert.assertTrue(
+                fieldExists("org/chromium/chrome/browser/toolbar/ToolbarManager", "mTabGroupUi"));
         Assert.assertTrue(
                 fieldExists("org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator",
                         "mTabSwitcherModeCoordinatorPhone"));

build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java

@@ -80,6 +80,9 @@ public BraveToolbarManagerClassAdapter(ClassVisitor visitor) {
         deleteField(sBraveToolbarManagerClassName, "mTabCountProvider");
         makeProtectedField(sToolbarManagerClassName, "mTabCountProvider");
 
+        deleteField(sBraveToolbarManagerClassName, "mTabGroupUi");
+        makeProtectedField(sToolbarManagerClassName, "mTabGroupUi");
+
         makePublicMethod(sToolbarManagerClassName, "onOrientationChange");
         addMethodAnnotation(
                 sBraveToolbarManagerClassName, "onOrientationChange", "Ljava/lang/Override;");