[Android] ThemeColorProvider replaces TabThemeColorProvider

Chromium change:
https://chromium.googlesource.com/chromium/src/+/eafd059d9f7f4656f7110349fa9ffd221dfae93c

Toolbar: TopUiThemeColorProvider

A ThemeColorProvider for top UI (TopUiThemeColorProvider)
replaces TabThemeColorProvider, and gets moved to a modularized
target chrome/browser/ui/android/theme. This is a new source of
truth for toolbar/top part of Chrome UI theme color.

Previously TabThemeColorHelper played the role, but now it was
redefined to provide the theme color coming from tab
contents only. TopUiThemeColorProvider puts together all
the signals and decides the final theme color to be used for
top UI.

Bug: 1127732

Author: samartnik

android/java/apk_for_test.flags

@@ -82,6 +82,7 @@
 }
 
 -keep class org.chromium.chrome.browser.toolbar.ToolbarManager {
+    public <init>(...);
     *** mBottomControlsCoordinatorSupplier;
     *** mCallbackController;
     *** mBrowserControlsSizer;
@@ -177,3 +178,7 @@
     *** addBookmarkInternal(...);
     *** createSnackbarControllerForEditButton(...);
 }
+
+-keep class org.chromium.chrome.browser.toolbar.BraveToolbarManager {
+    public <init>(...);
+}

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

@@ -9,6 +9,8 @@
 import android.support.test.filters.SmallTest;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,21 +21,34 @@
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.app.ChromeActivity;
+import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer;
+import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+import org.chromium.chrome.browser.findinpage.FindToolbarManager;
+import org.chromium.chrome.browser.fullscreen.FullscreenManager;
+import org.chromium.chrome.browser.identity_disc.IdentityDiscController;
 import org.chromium.chrome.browser.init.StartupTabPreloader;
+import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
 import org.chromium.chrome.browser.tabmodel.ChromeTabCreator;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.theme.TopUiThemeColorProvider;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
+import org.chromium.chrome.browser.toolbar.top.ToolbarActionModeCallback;
+import org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer;
+import org.chromium.chrome.browser.ui.TabObscuringHandler;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
+import org.chromium.chrome.browser.ui.system.StatusBarColorController;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.List;
 
 /**
  * Tests to check whether classes, methods and fields exist for bytecode manipulation.
@@ -63,6 +78,7 @@ public void testClassesExist() throws Exception {
         Assert.assertTrue(classExists(
                 "org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator"));
         Assert.assertTrue(classExists("org/chromium/chrome/browser/toolbar/ToolbarManager"));
+        Assert.assertTrue(classExists("org/chromium/chrome/browser/toolbar/BraveToolbarManager"));
         Assert.assertTrue(
                 classExists("org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator"));
         Assert.assertTrue(classExists(
@@ -180,6 +196,19 @@ public void testConstructorsExistAndMatch() throws Exception {
                 "org/chromium/chrome/browser/tabmodel/BraveTabCreator", ChromeActivity.class,
                 WindowAndroid.class, StartupTabPreloader.class, Supplier.class, boolean.class,
                 ChromeTabCreator.OverviewNTPCreator.class, AsyncTabParamsManager.class));
+        Assert.assertTrue(constructorsMatch("org/chromium/chrome/browser/toolbar/ToolbarManager",
+                "org/chromium/chrome/browser/toolbar/BraveToolbarManager", AppCompatActivity.class,
+                BrowserControlsSizer.class, FullscreenManager.class, ToolbarControlContainer.class,
+                CompositorViewHolder.class, Callback.class, TopUiThemeColorProvider.class,
+                TabObscuringHandler.class, ObservableSupplier.class, IdentityDiscController.class,
+                List.class, ActivityTabProvider.class, ScrimCoordinator.class,
+                ToolbarActionModeCallback.class, FindToolbarManager.class, ObservableSupplier.class,
+                ObservableSupplier.class, Supplier.class, OneshotSupplier.class,
+                OneshotSupplier.class, boolean.class, ObservableSupplier.class,
+                OneshotSupplier.class, ObservableSupplier.class, OneshotSupplier.class,
+                OneshotSupplier.class, WindowAndroid.class, Supplier.class, boolean.class,
+                Supplier.class, StatusBarColorController.class, AppMenuDelegate.class,
+                ActivityLifecycleDispatcher.class, Supplier.class));
     }
 
     @Test

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

@@ -15,6 +15,8 @@ public class BraveToolbarManagerClassAdapter extends BraveClassVisitor {
     public BraveToolbarManagerClassAdapter(ClassVisitor visitor) {
         super(visitor);
 
+        redirectConstructor(sToolbarManagerClassName, sBraveToolbarManagerClassName);
+
         deleteField(sBraveToolbarManagerClassName, "mBottomControlsCoordinatorSupplier");
         makeProtectedField(sToolbarManagerClassName, "mBottomControlsCoordinatorSupplier");
 

patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch

@@ -876,13 +876,19 @@ if (is_android) {
       "//base:base_java_test_support",
       "//chrome/android:chrome_apk_pak_assets",
       "//chrome/android:chrome_public_base_module_java_for_test",
+      "//chrome/browser/android/lifecycle:java",
+      "//chrome/browser/browser_controls/android:java",
+      "//chrome/browser/fullscreen/android:java",
       "//chrome/browser/preferences:java",
       "//chrome/browser/tab:java",
       "//chrome/browser/tabmodel:java",
       "//chrome/browser/ui/android/appmenu:java",
+      "//chrome/browser/ui/android/theme:java",
       "//chrome/test/android:chrome_java_test_support",
+      "//components/browser_ui/widget/android:java",
       "//components/search_engines/android:java",
       "//components/sync/android:sync_java",
+      "//third_party/android_deps:androidx_appcompat_appcompat_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/junit",
       "//ui/android:ui_no_recycler_view_java",