Remove crushed sprite resource and layer

chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc

Index: chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
diff --git a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
index 05bc04ce06f094eec9ad1a71a1ecbbf782a3d560..65e1880f79fe9601b8cbf83afe5e36e17ed3bb77 100644
--- a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
@@ -64,8 +64,7 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
     jint search_term_resource_id,
     jint search_caption_resource_id,
     jint search_bar_shadow_resource_id,
-    jint sprite_resource_id,
-    jint search_provider_icon_sprite_metadata_resource_id,
+    jint search_provider_icon_resource_id,
     jint quick_action_icon_resource_id,
     jint arrow_up_resource_id,
     jint close_icon_resource_id,
@@ -103,13 +102,11 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
     jfloat search_bar_border_height,
     jboolean search_bar_shadow_visible,
     jfloat search_bar_shadow_opacity,
-    jboolean search_provider_icon_sprite_visible,
-    jfloat search_provider_icon_sprite_completion_percentage,
     jboolean quick_action_icon_visible,
     jboolean thumbnail_visible,
     jstring j_thumbnail_url,
-    jfloat static_image_visibility_percentage,
-    jint static_image_size,
+    jfloat custom_image_visibility_percentage,
+    jint bar_image_size,
     jfloat arrow_icon_opacity,
     jfloat arrow_icon_rotation,
     jfloat close_icon_opacity,
@@ -126,7 +123,6 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
     jfloat touch_highlight_x_offset,
     jfloat touch_highlight_width,
     jobject j_profile) {
-
   // Load the thumbnail if necessary.
   std::string thumbnail_url =
       base::android::ConvertJavaStringToUTF8(env, j_thumbnail_url);
@@ -159,69 +155,30 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
   content_container_->SetPosition(gfx::PointF(0.0f, base_page_offset));
 
   contextual_search_layer_->SetProperties(
-      search_bar_background_resource_id,
-      search_context_resource_id,
-      search_term_resource_id,
-      search_caption_resource_id,
-      search_bar_shadow_resource_id,
-      sprite_resource_id,
-      search_provider_icon_sprite_metadata_resource_id,
-      quick_action_icon_resource_id,
-      arrow_up_resource_id,
-      close_icon_resource_id,
-      progress_bar_background_resource_id,
-      progress_bar_resource_id,
-      search_promo_resource_id,
-      peek_promo_ripple_resource_id,
-      peek_promo_text_resource_id,
-      dp_to_px,
-      content_layer,
-      search_promo_visible,
-      search_promo_height,
-      search_promo_opacity,
-      search_peek_promo_visible,
-      search_peek_promo_height,
-      search_peek_promo_padding,
-      search_peek_promo_ripple_width,
-      search_peek_promo_ripple_opacity,
-      search_peek_promo_text_opacity,
-      search_panel_x,
-      search_panel_y,
-      search_panel_width,
-      search_panel_height,
-      search_bar_margin_side,
-      search_bar_height,
-      search_context_opacity,
-      search_text_layer_min_height,
-      search_term_opacity,
-      search_term_caption_spacing,
-      search_caption_animation_percentage,
-      search_caption_visible,
-      search_bar_border_visible,
-      search_bar_border_height,
-      search_bar_shadow_visible,
-      search_bar_shadow_opacity,
-      search_provider_icon_sprite_visible,
-      search_provider_icon_sprite_completion_percentage,
-      quick_action_icon_visible,
-      thumbnail_visible,
-      static_image_visibility_percentage,
-      static_image_size,
-      arrow_icon_opacity,
-      arrow_icon_rotation,
-      close_icon_opacity,
-      progress_bar_visible,
-      progress_bar_height,
-      progress_bar_opacity,
-      progress_bar_completion,
-      divider_line_visibility_percentage,
-      divider_line_width,
-      divider_line_height,
-      divider_line_color,
-      divider_line_x_offset,
-      touch_highlight_visible,
-      touch_highlight_x_offset,
-      touch_highlight_width);
+      search_bar_background_resource_id, search_context_resource_id,
+      search_term_resource_id, search_caption_resource_id,
+      search_bar_shadow_resource_id, search_provider_icon_resource_id,
+      quick_action_icon_resource_id, arrow_up_resource_id,
+      close_icon_resource_id, progress_bar_background_resource_id,
+      progress_bar_resource_id, search_promo_resource_id,
+      peek_promo_ripple_resource_id, peek_promo_text_resource_id, dp_to_px,
+      content_layer, search_promo_visible, search_promo_height,
+      search_promo_opacity, search_peek_promo_visible, search_peek_promo_height,
+      search_peek_promo_padding, search_peek_promo_ripple_width,
+      search_peek_promo_ripple_opacity, search_peek_promo_text_opacity,
+      search_panel_x, search_panel_y, search_panel_width, search_panel_height,
+      search_bar_margin_side, search_bar_height, search_context_opacity,
+      search_text_layer_min_height, search_term_opacity,
+      search_term_caption_spacing, search_caption_animation_percentage,
+      search_caption_visible, search_bar_border_visible,
+      search_bar_border_height, search_bar_shadow_visible,
+      search_bar_shadow_opacity, quick_action_icon_visible, thumbnail_visible,
+      custom_image_visibility_percentage, bar_image_size, arrow_icon_opacity,
+      arrow_icon_rotation, close_icon_opacity, progress_bar_visible,
+      progress_bar_height, progress_bar_opacity, progress_bar_completion,
+      divider_line_visibility_percentage, divider_line_width,
+      divider_line_height, divider_line_color, divider_line_x_offset,
+      touch_highlight_visible, touch_highlight_x_offset, touch_highlight_width);
 
   // Make the layer visible if it is not already.
   contextual_search_layer_->layer()->SetHideLayerAndSubtree(false);