Update from https://crrev.com/316786

cc/layers/tiled_layer_impl.h

 // 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.
 
 #ifndef CC_LAYERS_TILED_LAYER_IMPL_H_
 #define CC_LAYERS_TILED_LAYER_IMPL_H_
 
 #include <string>
 
 #include "cc/base/cc_export.h"
@@ skipping 18 matching lines @@
         new TiledLayerImpl(tree_impl, id, synced_scroll_offset));
   }
   ~TiledLayerImpl() override;
 
   scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
   void PushPropertiesTo(LayerImpl* layer) override;
 
   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,
                              gfx::Size* resource_size) const override;
 
   void set_skips_draw(bool skips_draw) { skips_draw_ = skips_draw; }
   void SetTilingData(const LayerTilingData& tiler);
   void PushTileProperties(int i,
                           int j,
                           ResourceProvider::ResourceId resource,
@@ skipping 11 matching lines @@
   TiledLayerImpl(LayerTreeImpl* tree_impl, int id);
   TiledLayerImpl(
       LayerTreeImpl* tree_impl,
       int id,
       scoped_refptr<LayerImpl::SyncedScrollOffset> synced_scroll_offset);
   // Exposed for testing.
   bool HasTileAt(int i, int j) const;
   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;
 
   DrawableTile* TileAt(int i, int j) const;
   DrawableTile* CreateTile(int i, int j);
 
   bool skips_draw_;
 
   scoped_ptr<LayerTilingData> tiler_;
 
   DISALLOW_COPY_AND_ASSIGN(TiledLayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_TILED_LAYER_IMPL_H_