| Index: cc/layers/layer_collections.h
|
| diff --git a/cc/layers/layer_collections.h b/cc/layers/layer_collections.h
|
| index 6830261629e6713dd531a3979831727bec134689..23c6c10d0a119b4005c1eb4b21d664578165520a 100644
|
| --- a/cc/layers/layer_collections.h
|
| +++ b/cc/layers/layer_collections.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef CC_LAYERS_LAYER_COLLECTIONS_H_
|
| #define CC_LAYERS_LAYER_COLLECTIONS_H_
|
|
|
| +#include <memory>
|
| #include <unordered_map>
|
| #include <vector>
|
|
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
|
|
| namespace cc {
|
| @@ -17,9 +17,9 @@ class Layer;
|
| class LayerImpl;
|
|
|
| using LayerList = std::vector<scoped_refptr<Layer>>;
|
| -using OwnedLayerImplList = std::vector<scoped_ptr<LayerImpl>>;
|
| +using OwnedLayerImplList = std::vector<std::unique_ptr<LayerImpl>>;
|
| using LayerImplList = std::vector<LayerImpl*>;
|
| -using OwnedLayerImplMap = std::unordered_map<int, scoped_ptr<LayerImpl>>;
|
| +using OwnedLayerImplMap = std::unordered_map<int, std::unique_ptr<LayerImpl>>;
|
| using LayerImplMap = std::unordered_map<int, LayerImpl*>;
|
|
|
| } // namespace cc
|
|
|