| Index: cc/output/begin_frame_args.h
|
| diff --git a/cc/output/begin_frame_args.h b/cc/output/begin_frame_args.h
|
| index 274963103ca4bb0290c3b1ae897235b26b5e8a24..c8c7b2f227761660064a916e2a91a1c655580fcd 100644
|
| --- a/cc/output/begin_frame_args.h
|
| +++ b/cc/output/begin_frame_args.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef CC_OUTPUT_BEGIN_FRAME_ARGS_H_
|
| #define CC_OUTPUT_BEGIN_FRAME_ARGS_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/location.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "base/values.h"
|
| #include "cc/base/cc_export.h"
|
| @@ -83,7 +84,7 @@ struct CC_EXPORT BeginFrameArgs {
|
|
|
| bool IsValid() const { return interval >= base::TimeDelta(); }
|
|
|
| - 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;
|
|
|
| void ToProtobuf(proto::BeginFrameArgs* proto) const;
|
|
|