| Index: cc/playback/compositing_display_item.h
|
| diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h
|
| index cf6722206f588b84f32a5b12b72f2d10d1fb7296..484cb4b6c12a1dffea04216629671f9344df6b3d 100644
|
| --- a/cc/playback/compositing_display_item.h
|
| +++ b/cc/playback/compositing_display_item.h
|
| @@ -8,7 +8,9 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| +#include "base/memory/ptr_util.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/playback/display_item.h"
|
| #include "third_party/skia/include/core/SkColorFilter.h"
|
| @@ -66,8 +68,8 @@ class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
|
| explicit EndCompositingDisplayItem(const proto::DisplayItem& proto);
|
| ~EndCompositingDisplayItem() override;
|
|
|
| - static scoped_ptr<EndCompositingDisplayItem> Create() {
|
| - return make_scoped_ptr(new EndCompositingDisplayItem());
|
| + static std::unique_ptr<EndCompositingDisplayItem> Create() {
|
| + return base::WrapUnique(new EndCompositingDisplayItem());
|
| }
|
|
|
| void ToProtobuf(proto::DisplayItem* proto,
|
|
|