Index: cc/output/compositor_frame.h |
diff --git a/cc/output/compositor_frame.h b/cc/output/compositor_frame.h |
index 8a95fffe271365e7c51dbec68ce1839c6a7e0941..e5e0c660f6faeb3930d5f3339bb686b380e605bd 100644 |
--- a/cc/output/compositor_frame.h |
+++ b/cc/output/compositor_frame.h |
@@ -5,8 +5,9 @@ |
#ifndef CC_OUTPUT_COMPOSITOR_FRAME_H_ |
#define CC_OUTPUT_COMPOSITOR_FRAME_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "cc/base/cc_export.h" |
#include "cc/output/compositor_frame_metadata.h" |
#include "cc/output/delegated_frame_data.h" |
@@ -23,8 +24,8 @@ class CC_EXPORT CompositorFrame { |
~CompositorFrame(); |
CompositorFrameMetadata metadata; |
- scoped_ptr<DelegatedFrameData> delegated_frame_data; |
- scoped_ptr<GLFrameData> gl_frame_data; |
+ std::unique_ptr<DelegatedFrameData> delegated_frame_data; |
+ std::unique_ptr<GLFrameData> gl_frame_data; |
void AssignTo(CompositorFrame* target); |