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 f639f1a6727cdabf993489cc4223285f9f9ff6a5..3b6e127348e322736a2432168c4c618c77f8087e 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
@@ -61,8 +61,10 @@ public class TabListSceneLayer extends SceneLayer {
                     ? ApiCompatibilityUtils.getColor(res, R.color.incognito_primary_color)
                     : ApiCompatibilityUtils.getColor(res, R.color.default_primary_color);
 
+            int defaultCloseButtonColor = ColorUtils.getThemedAssetColor(defaultThemeColor,
+                    t.isIncognito());
             int closeButtonColor = ColorUtils.getThemedAssetColor(t.getToolbarBackgroundColor(),
-                        t.isIncognito());
+                    t.isIncognito());
 
             int borderColorResource =
                     t.isIncognito() ? R.color.tab_back_incognito : R.color.tab_back;
@@ -88,7 +90,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());
@@ -139,8 +142,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);
 }