| Index: cc/output/compositor_frame_ack.h
|
| diff --git a/cc/output/compositor_frame_ack.h b/cc/output/compositor_frame_ack.h
|
| index a4e161b3d8d43503366297e00427a760489e9415..55ca7f1ccb0ab3a0d8a0ec3d6706e3b342f02c06 100644
|
| --- a/cc/output/compositor_frame_ack.h
|
| +++ b/cc/output/compositor_frame_ack.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_
|
| #define CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/output/gl_frame_data.h"
|
| #include "cc/resources/returned_resource.h"
|
| @@ -19,7 +20,7 @@ class CC_EXPORT CompositorFrameAck {
|
| ~CompositorFrameAck();
|
|
|
| ReturnedResourceArray resources;
|
| - scoped_ptr<GLFrameData> gl_frame_data;
|
| + std::unique_ptr<GLFrameData> gl_frame_data;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(CompositorFrameAck);
|
|
|