Update from https://crrev.com/316786

cc/layers/render_surface_unittest.cc

 // Copyright 2011 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/base/scoped_ptr_vector.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/render_pass_sink.h"
 #include "cc/layers/render_surface_impl.h"
 #include "cc/quads/shared_quad_state.h"
@@ skipping 84 matching lines @@
 
   SkXfermode::Mode blend_mode = SkXfermode::kSoftLight_Mode;
   owning_layer->SetBlendMode(blend_mode);
   RenderSurfaceImpl* render_surface = owning_layer->render_surface();
 
   root_layer->AddChild(owning_layer.Pass());
 
   gfx::Rect content_rect(0, 0, 50, 50);
   gfx::Rect clip_rect(5, 5, 40, 40);
   gfx::Transform origin;
-
   origin.Translate(30, 40);
 
-  render_surface->SetDrawTransform(origin);
   render_surface->SetContentRect(content_rect);
   render_surface->SetClipRect(clip_rect);
   render_surface->SetDrawOpacity(1.f);
 
-  MockOcclusionTracker<LayerImpl> occlusion_tracker;
   scoped_ptr<RenderPass> render_pass = RenderPass::Create();
   AppendQuadsData append_quads_data;
 
-  bool for_replica = false;
-  render_surface->AppendQuads(render_pass.get(),
-                              occlusion_tracker,
-                              &append_quads_data,
-                              for_replica,
+  render_surface->AppendQuads(render_pass.get(), origin, Occlusion(),
+                              SK_ColorBLACK, 1.f, nullptr, &append_quads_data,
                               RenderPassId(2, 0));
 
   ASSERT_EQ(1u, render_pass->shared_quad_state_list.size());
   SharedQuadState* shared_quad_state =
       render_pass->shared_quad_state_list.front();
 
   EXPECT_EQ(
       30.0,
       shared_quad_state->content_to_target_transform.matrix().getDouble(0, 3));
   EXPECT_EQ(
@@ skipping 48 matching lines @@
   ASSERT_EQ(1u, pass_sink.RenderPasses().size());
   RenderPass* pass = pass_sink.RenderPasses()[0];
 
   EXPECT_EQ(RenderPassId(2, 0), pass->id);
   EXPECT_EQ(content_rect, pass->output_rect);
   EXPECT_EQ(origin, pass->transform_to_root_target);
 }
 
 }  // namespace
 }  // namespace cc