| Index: gpu/tools/compositor_model_bench/forward_render_model.h
|
| diff --git a/gpu/tools/compositor_model_bench/forward_render_model.h b/gpu/tools/compositor_model_bench/forward_render_model.h
|
| index ec34948f535419f3d49c8ca9589d78099dedd223..cceddd93a8dfe6f60c080d9f93cbce81d6b2b163 100644
|
| --- a/gpu/tools/compositor_model_bench/forward_render_model.h
|
| +++ b/gpu/tools/compositor_model_bench/forward_render_model.h
|
| @@ -7,8 +7,9 @@
|
| #ifndef GPU_TOOLS_COMPOSITOR_MODEL_BENCH_FORWARD_RENDER_MODEL_H_
|
| #define GPU_TOOLS_COMPOSITOR_MODEL_BENCH_FORWARD_RENDER_MODEL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "gpu/tools/compositor_model_bench/render_model_utils.h"
|
| #include "gpu/tools/compositor_model_bench/render_models.h"
|
|
|
| @@ -24,8 +25,8 @@ class ForwardRenderSimulator : public RenderModelSimulator {
|
| void Resize(int width, int height) override;
|
|
|
| private:
|
| - scoped_ptr<ForwardRenderNodeVisitor> visitor_;
|
| - scoped_ptr<TextureGenerator> textures_;
|
| + std::unique_ptr<ForwardRenderNodeVisitor> visitor_;
|
| + std::unique_ptr<TextureGenerator> textures_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(ForwardRenderSimulator);
|
| };
|
|
|