Do not include toolbar shadow for UIResourceLayer snapshot

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 aa9ab6f0b776766814ed44561c4e4305a4082ed2..f01bb02fa474df4932493433d550944b71f6276f 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
@@ -74,8 +74,12 @@ public class TabListSceneLayer extends SceneLayer {
                                                : R.drawable.btn_tab_close_normal;
             int borderColorResource =
                     t.isIncognito() ? R.color.tab_back_incognito : R.color.tab_back;
+
+            boolean needsToolbarShadow = t.needsToolbarShadow() || t.getToolbarYOffset() != 0;
+
             // TODO(dtrainor, clholgat): remove "* dpToPx" once the native part fully supports dp.
-            nativePutTabLayer(mNativePtr, t.getId(), R.id.control_container, closeBtnResource,
+            nativePutTabLayer(mNativePtr, t.getId(), R.id.control_container,
+                    R.drawable.toolbar_shadow, closeBtnResource,
                     R.drawable.tabswitcher_border_frame_shadow,
                     R.drawable.tabswitcher_border_frame_decoration, R.drawable.logo_card_back,
                     R.drawable.tabswitcher_border_frame,
@@ -98,7 +102,7 @@ public class TabListSceneLayer extends SceneLayer {
                     defaultThemeColor, t.getToolbarBackgroundColor(), t.anonymizeToolbar(),
                     R.drawable.textbox, t.getTextBoxBackgroundColor(), t.getTextBoxAlpha(),
                     t.getToolbarAlpha(), t.getToolbarYOffset() * dpToPx, t.getSideBorderScale(),
-                    true, t.insetBorderVertical());
+                    true, t.insetBorderVertical(), needsToolbarShadow);
         }
         nativeFinishBuildingFrame(mNativePtr);
     }
@@ -136,18 +140,19 @@ public class TabListSceneLayer extends SceneLayer {
             LayerTitleCache layerTitleCache, TabContentManager tabContentManager,
             ResourceManager resourceManager);
     private native void nativePutTabLayer(long nativeTabListSceneLayer, int id,
-            int toolbarResourceId, int closeButtonResourceId, int shadowResourceId,
-            int contourResourceId, int backLogoResourceId, int borderResourceId,
-            int borderInnerShadowResourceId, boolean canUseLiveLayer, int tabBackgroundColor,
-            int backLogoColor, boolean incognito, boolean isPortrait, float x, float y, float width,
-            float height, float contentWidth, float contentHeight, float visibleContentHeight,
-            float shadowX, float shadowY, float shadowWidth, float shadowHeight, float pivotX,
-            float pivotY, float rotationX, float rotationY, float alpha, float borderAlpha,
-            float borderInnerShadowAlpha, float contourAlpha, float shadowAlpha, float closeAlpha,
-            float closeBtnWidth, float staticToViewBlend, float borderScale, float saturation,
-            float brightness, boolean showToolbar, int defaultThemeColor,
-            int toolbarBackgroundColor, boolean anonymizeToolbar, int toolbarTextBoxResource,
-            int toolbarTextBoxBackgroundColor, float toolbarTextBoxAlpha, float toolbarAlpha,
-            float toolbarYOffset, float sideBorderScale, boolean attachContent,
-            boolean insetVerticalBorder);
+            int toolbarResourceId, int toolbarShadowResourceId, int closeButtonResourceId,
+            int shadowResourceId, int contourResourceId, int backLogoResourceId,
+            int borderResourceId, int borderInnerShadowResourceId, boolean canUseLiveLayer,
+            int tabBackgroundColor, int backLogoColor, boolean incognito, boolean isPortrait,
+            float x, float y, float width, float height, float contentWidth, float contentHeight,
+            float visibleContentHeight, float shadowX, float shadowY, float shadowWidth,
+            float shadowHeight, float pivotX, float pivotY, float rotationX, float rotationY,
+            float alpha, float borderAlpha, float borderInnerShadowAlpha, float contourAlpha,
+            float shadowAlpha, float closeAlpha, float closeBtnWidth, float staticToViewBlend,
+            float borderScale, float saturation, float brightness, boolean showToolbar,
+            int defaultThemeColor, int toolbarBackgroundColor, boolean anonymizeToolbar,
+            int toolbarTextBoxResource, int toolbarTextBoxBackgroundColor,
+            float toolbarTextBoxAlpha, float toolbarAlpha, float toolbarYOffset,
+            float sideBorderScale, boolean attachContent, boolean insetVerticalBorder,
+            boolean needsToolbarShadow);
 }