Update from https://crrev.com/314320

cc/test/layer_test_common.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/layer_test_common.h"
 
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/draw_quad.h"
@@ skipping 119 matching lines @@
                       SimpleEnclosedRegion(occluded),
                       SimpleEnclosedRegion());
 
   layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider());
   layer_impl->AppendQuads(render_pass_.get(), occlusion, &data);
   layer_impl->DidDraw(resource_provider());
 }
 
 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());
 }
 
 void LayerTestCommon::LayerImplTest::AppendSurfaceQuadsWithOcclusion(
     RenderSurfaceImpl* surface_impl,
     const gfx::Rect& occluded) {
   AppendQuadsData data;
 
   render_pass_->quad_list.clear();
   render_pass_->shared_quad_state_list.clear();
   occlusion_tracker_.set_occluded_target_rect_for_contributing_surface(
       occluded);
   bool for_replica = false;
   RenderPassId id(1, 1);
   surface_impl->AppendQuads(
       render_pass_.get(), occlusion_tracker_, &data, for_replica, id);
 }
 
 }  // namespace cc