| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index b4050bd1afa2495103e15f87cd215994fb175616..dc48635a0ce0a62725e2dde869987013b4e0167e 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -174,7 +174,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| void ForceSerializeOnSwapBuffers() override;
|
| bool SupportsImplScrolling() const override;
|
| void SetDebugState(const LayerTreeDebugState& debug_state) override;
|
| - void AsValueInto(base::debug::TracedValue* value) const override;
|
| + void AsValueInto(base::trace_event::TracedValue* value) const override;
|
| bool MainFrameWillHappenForTesting() override;
|
| void SetChildrenNeedBeginFrames(bool children_need_begin_frames) override;
|
|
|
| @@ -277,7 +277,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| void MainFrameWillHappenOnImplThreadForTesting(CompletionEvent* completion,
|
| bool* main_frame_will_happen);
|
| void AsValueOnImplThread(CompletionEvent* completion,
|
| - base::debug::TracedValue* state) const;
|
| + base::trace_event::TracedValue* state) const;
|
| void SetSwapUsedIncompleteTileOnImplThread(bool used_incomplete_tile);
|
| void MainThreadHasStoppedFlingingOnImplThread();
|
| void SetInputThrottledUntilCommitOnImplThread(bool is_throttled);
|
|
|