| Index: gpu/tools/compositor_model_bench/render_models.h
|
| diff --git a/gpu/tools/compositor_model_bench/render_models.h b/gpu/tools/compositor_model_bench/render_models.h
|
| index 5d04a3f25cd1c069e52f375b446eba1e4256591a..cc17dcb3845e6a07f9e8fb0f1b1825f0976247c7 100644
|
| --- a/gpu/tools/compositor_model_bench/render_models.h
|
| +++ b/gpu/tools/compositor_model_bench/render_models.h
|
| @@ -8,10 +8,10 @@
|
| #ifndef GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_MODELS_H_
|
| #define GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_MODELS_H_
|
|
|
| -#include "gpu/tools/compositor_model_bench/render_tree.h"
|
| +#include <memory>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include "gpu/tools/compositor_model_bench/render_tree.h"
|
|
|
| enum RenderModel {
|
| ForwardRenderModel
|
| @@ -27,7 +27,7 @@ class RenderModelSimulator {
|
|
|
| protected:
|
| explicit RenderModelSimulator(RenderNode* root);
|
| - scoped_ptr<RenderNode> root_;
|
| + std::unique_ptr<RenderNode> root_;
|
|
|
| private:
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(RenderModelSimulator);
|
|
|