Update from https://crrev.com/316786

cc/resources/tile_draw_info.h

 // Copyright 2013 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_RESOURCES_TILE_DRAW_INFO_H_
 #define CC_RESOURCES_TILE_DRAW_INFO_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/resources/platform_color.h"
@@ skipping 41 matching lines @@
     return mode_ == RESOURCE_MODE || mode_ == PICTURE_PILE_MODE;
   }
 
   inline bool has_resource() const { return !!resource_; }
 
   void SetSolidColorForTesting(SkColor color) { set_solid_color(color); }
   void SetResourceForTesting(scoped_ptr<ScopedResource> resource) {
     resource_ = resource.Pass();
   }
 
-  void AsValueInto(base::debug::TracedValue* state) const;
+  void AsValueInto(base::trace_event::TracedValue* state) const;
 
  private:
   friend class Tile;
   friend class TileManager;
 
   void set_use_resource() { mode_ = RESOURCE_MODE; }
 
   void set_solid_color(const SkColor& color) {
     mode_ = SOLID_COLOR_MODE;
     solid_color_ = color;
   }
 
   void set_rasterize_on_demand() { mode_ = PICTURE_PILE_MODE; }
 
   Mode mode_;
   SkColor solid_color_;
   scoped_ptr<ScopedResource> resource_;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_DRAW_INFO_H_