| Index: cc/layers/layer_impl.cc
|
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
|
| index fd5ea31549b66c593b5895a6679a44332bff5be8..9dd23186ef5118ff92b450eb5e4329eee20d1fa7 100644
|
| --- a/cc/layers/layer_impl.cc
|
| +++ b/cc/layers/layer_impl.cc
|
| @@ -5,6 +5,7 @@
|
| #include "cc/layers/layer_impl.h"
|
|
|
| #include "base/debug/trace_event.h"
|
| +#include "base/debug/traced_value.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "cc/animation/animation_registrar.h"
|
| @@ -13,7 +14,6 @@
|
| #include "cc/debug/debug_colors.h"
|
| #include "cc/debug/layer_tree_debug_state.h"
|
| #include "cc/debug/micro_benchmark_impl.h"
|
| -#include "cc/debug/traced_value.h"
|
| #include "cc/input/layer_scroll_offset_delegate.h"
|
| #include "cc/layers/layer_utils.h"
|
| #include "cc/layers/painted_scrollbar_layer_impl.h"
|
| @@ -1415,7 +1415,7 @@ void LayerImpl::RemoveDependentNeedsPushProperties() {
|
| }
|
|
|
| void LayerImpl::AsValueInto(base::DictionaryValue* state) const {
|
| - TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
|
| + base::debug::TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
|
| TRACE_DISABLED_BY_DEFAULT("cc.debug"),
|
| state,
|
| "cc::LayerImpl",
|
|
|