| Index: cc/trees/thread_proxy.cc
|
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
|
| index 5ee43aba95c327f3d0ab7c8e2c891a9d1fb6b758..db69b8203def40e71e3bf89575907a0be09da1ee 100644
|
| --- a/cc/trees/thread_proxy.cc
|
| +++ b/cc/trees/thread_proxy.cc
|
| @@ -1232,12 +1232,12 @@ ThreadProxy::BeginMainFrameAndCommitState::BeginMainFrameAndCommitState()
|
|
|
| ThreadProxy::BeginMainFrameAndCommitState::~BeginMainFrameAndCommitState() {}
|
|
|
| -void ThreadProxy::AsValueInto(base::debug::TracedValue* state) const {
|
| +void ThreadProxy::AsValueInto(base::trace_event::TracedValue* state) const {
|
| CompletionEvent completion;
|
| {
|
| DebugScopedSetMainThreadBlocked main_thread_blocked(
|
| const_cast<ThreadProxy*>(this));
|
| - scoped_refptr<base::debug::TracedValue> state_refptr(state);
|
| + scoped_refptr<base::trace_event::TracedValue> state_refptr(state);
|
| Proxy::ImplThreadTaskRunner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&ThreadProxy::AsValueOnImplThread,
|
| @@ -1248,8 +1248,9 @@ void ThreadProxy::AsValueInto(base::debug::TracedValue* state) const {
|
| }
|
| }
|
|
|
| -void ThreadProxy::AsValueOnImplThread(CompletionEvent* completion,
|
| - base::debug::TracedValue* state) const {
|
| +void ThreadProxy::AsValueOnImplThread(
|
| + CompletionEvent* completion,
|
| + base::trace_event::TracedValue* state) const {
|
| state->BeginDictionary("layer_tree_host_impl");
|
| impl().layer_tree_host_impl->AsValueInto(state);
|
| state->EndDictionary();
|
|
|