Update from https://crrev.com/314320

cc/test/layer_test_common.cc

Index: cc/test/layer_test_common.cc
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index 99d3c1c06996a613ad9e3907230ed7c534d74e01..7e835b892a59a1fe372672fad0dddd2dec52e13d 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -137,19 +137,19 @@ void LayerTestCommon::LayerImplTest::AppendQuadsWithOcclusion(
 
 void LayerTestCommon::LayerImplTest::AppendQuadsForPassWithOcclusion(
     LayerImpl* layer_impl,
-    const RenderPassId& id,
+    RenderPass* given_render_pass,
     const gfx::Rect& occluded) {
-  AppendQuadsData data(id);
+  AppendQuadsData data;
 
-  render_pass_->quad_list.clear();
-  render_pass_->shared_quad_state_list.clear();
+  given_render_pass->quad_list.clear();
+  given_render_pass->shared_quad_state_list.clear();
 
   Occlusion occlusion(layer_impl->draw_transform(),
                       SimpleEnclosedRegion(occluded),
                       SimpleEnclosedRegion());
 
   layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider());
-  layer_impl->AppendQuads(render_pass_.get(), occlusion, &data);
+  layer_impl->AppendQuads(given_render_pass, occlusion, &data);
   layer_impl->DidDraw(resource_provider());
 }