| Index: cc/output/overlay_processor.h
|
| diff --git a/cc/output/overlay_processor.h b/cc/output/overlay_processor.h
|
| index 4a441a8c2d762d63c1bd1ed9da59d9f22ad428bf..01c28d253174aca976d65bff43138477b5146c4b 100644
|
| --- a/cc/output/overlay_processor.h
|
| +++ b/cc/output/overlay_processor.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_OUTPUT_OVERLAY_PROCESSOR_H_
|
| #define CC_OUTPUT_OVERLAY_PROCESSOR_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/output/ca_layer_overlay.h"
|
| #include "cc/output/overlay_candidate.h"
|
| @@ -29,7 +30,7 @@ class CC_EXPORT OverlayProcessor {
|
| RenderPass* render_pass,
|
| OverlayCandidateList* candidates) = 0;
|
| };
|
| - using StrategyList = std::vector<scoped_ptr<Strategy>>;
|
| + using StrategyList = std::vector<std::unique_ptr<Strategy>>;
|
|
|
| explicit OverlayProcessor(OutputSurface* surface);
|
| virtual ~OverlayProcessor();
|
|
|