Update from https://crrev.com/316786

cc/layers/tiled_layer_impl.h

Index: cc/layers/tiled_layer_impl.h
diff --git a/cc/layers/tiled_layer_impl.h b/cc/layers/tiled_layer_impl.h
index 039bf19a8005114fc2d0832d5e378023980ef640..c292790d0a5ec0e0f9a666ae5cbf42c081f855bd 100644
--- a/cc/layers/tiled_layer_impl.h
+++ b/cc/layers/tiled_layer_impl.h
@@ -36,7 +36,6 @@ class CC_EXPORT TiledLayerImpl : public LayerImpl {
   bool WillDraw(DrawMode draw_mode,
                 ResourceProvider* resource_provider) override;
   void AppendQuads(RenderPass* render_pass,
-                   const Occlusion& occlusion_in_content_space,
                    AppendQuadsData* append_quads_data) override;
 
   void GetContentsResourceId(ResourceProvider::ResourceId* resource_id,
@@ -68,7 +67,7 @@ class CC_EXPORT TiledLayerImpl : public LayerImpl {
   bool HasResourceIdForTileAt(int i, int j) const;
 
   void GetDebugBorderProperties(SkColor* color, float* width) const override;
-  void AsValueInto(base::debug::TracedValue* dict) const override;
+  void AsValueInto(base::trace_event::TracedValue* dict) const override;
 
  private:
   const char* LayerTypeAsString() const override;