Add tinted static UI resource cache

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
index 6415820c0f4fc388a036f13d87e208498b4bc16f..c909ec6279bb416806d9c0c0f8abb3f8c1e565c5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
@@ -62,8 +62,9 @@ public class TabListSceneLayer extends SceneLayer {
                     ? ApiCompatibilityUtils.getColor(res, R.color.incognito_primary_color)
                     : ApiCompatibilityUtils.getColor(res, R.color.default_primary_color);
 
-            int closeButtonColor = ColorUtils.getThemedAssetColor(defaultThemeColor,
+            int defaultCloseButtonColor = ColorUtils.getThemedAssetColor(defaultThemeColor,
                     t.isIncognito());
+            int closeButtonColor = defaultCloseButtonColor;
 
             // If theme colors are enabled in the tab switcher, use them to color the assets.
             if (FeatureUtilities.areTabSwitcherThemeColorsEnabled()) {
@@ -95,7 +96,8 @@ public class TabListSceneLayer extends SceneLayer {
                     t.getShadowOpacity() * decoration, t.getBorderCloseButtonAlpha() * decoration,
                     LayoutTab.CLOSE_BUTTON_WIDTH_DP * dpToPx, t.getStaticToViewBlend(),
                     t.getBorderScale(), t.getSaturation(), t.getBrightness(), t.showToolbar(),
-                    defaultThemeColor, t.getToolbarBackgroundColor(), closeButtonColor,
+                    defaultThemeColor, t.getToolbarBackgroundColor(),
+                    defaultCloseButtonColor, closeButtonColor,
                     t.anonymizeToolbar(), R.drawable.textbox, t.getTextBoxBackgroundColor(),
                     t.getTextBoxAlpha(), t.getToolbarAlpha(), t.getToolbarYOffset() * dpToPx,
                     t.getSideBorderScale(), true, t.insetBorderVertical());
@@ -146,8 +148,8 @@ public class TabListSceneLayer extends SceneLayer {
             float borderInnerShadowAlpha, float contourAlpha, float shadowAlpha, float closeAlpha,
             float closeBtnWidth, float staticToViewBlend, float borderScale, float saturation,
             float brightness, boolean showToolbar, int defaultThemeColor,
-            int toolbarBackgroundColor, int closeButtonColor, boolean anonymizeToolbar,
-            int toolbarTextBoxResource, int toolbarTextBoxBackgroundColor,
+            int toolbarBackgroundColor, int defaultCloseButtonColor, int closeButtonColor,
+            boolean anonymizeToolbar, int toolbarTextBoxResource, int toolbarTextBoxBackgroundColor,
             float toolbarTextBoxAlpha, float toolbarAlpha, float toolbarYOffset,
             float sideBorderScale, boolean attachContent, boolean insetVerticalBorder);
 }