Update from https://crrev.com/316786

cc/test/fake_picture_layer_impl.cc

Index: cc/test/fake_picture_layer_impl.cc
diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc
index 43db7bcf8f2f142273c668032ac0a5c3875bcf43..5ac6f69e3e039a134106b02add5e175cdbb5cd1b 100644
--- a/cc/test/fake_picture_layer_impl.cc
+++ b/cc/test/fake_picture_layer_impl.cc
@@ -86,10 +86,8 @@ void FakePictureLayerImpl::PushPropertiesTo(LayerImpl* layer_impl) {
 
 void FakePictureLayerImpl::AppendQuads(
     RenderPass* render_pass,
-    const Occlusion& occlusion_in_content_space,
     AppendQuadsData* append_quads_data) {
-  PictureLayerImpl::AppendQuads(
-      render_pass, occlusion_in_content_space, append_quads_data);
+  PictureLayerImpl::AppendQuads(render_pass, append_quads_data);
   ++append_quads_count_;
 }
 
@@ -137,6 +135,12 @@ void FakePictureLayerImpl::SetRasterSourceOnPending(
   UpdateRasterSource(raster_source, &invalidation_temp, pending_set);
 }
 
+void FakePictureLayerImpl::SetIsDrawnRenderSurfaceLayerListMember(bool is) {
+  draw_properties().last_drawn_render_surface_layer_list_id =
+      is ? layer_tree_impl()->current_render_surface_list_id()
+         : layer_tree_impl()->current_render_surface_list_id() - 1;
+}
+
 void FakePictureLayerImpl::CreateAllTiles() {
   for (size_t i = 0; i < num_tilings(); ++i)
     tilings_->tiling_at(i)->CreateAllTilesForTesting();