Index: cc/scheduler/scheduler_state_machine.h |
diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h |
index f1872fe62d0e784cdb2565824c01f4d4d8a07034..2d0ee144d196422a57bc8fba33ccd3a9a6c08a07 100644 |
--- a/cc/scheduler/scheduler_state_machine.h |
+++ b/cc/scheduler/scheduler_state_machine.h |
@@ -5,10 +5,10 @@ |
#ifndef CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_ |
#define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_ |
+#include <memory> |
#include <string> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "cc/base/cc_export.h" |
#include "cc/output/begin_frame_args.h" |
#include "cc/scheduler/commit_earlyout_reason.h" |
@@ -129,7 +129,7 @@ class CC_EXPORT SchedulerStateMachine { |
}; |
static const char* ActionToString(Action action); |
- scoped_ptr<base::trace_event::ConvertableToTraceFormat> AsValue() const; |
+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat> AsValue() const; |
void AsValueInto(base::trace_event::TracedValue* dict) const; |
Action NextAction() const; |