| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index b3a77400129810f7e49c31ebc202c2fface7f96d..bb8944e1ec81e0606eb139b9546cfae8467bf53b 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -19,7 +19,6 @@
|
| #include "base/time/time.h"
|
| #include "cc/animation/animation_events.h"
|
| #include "cc/base/cc_export.h"
|
| -#include "cc/base/scoped_ptr_vector.h"
|
| #include "cc/debug/frame_timing_tracker.h"
|
| #include "cc/debug/micro_benchmark.h"
|
| #include "cc/debug/micro_benchmark_controller.h"
|
| @@ -491,7 +490,7 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
|
| TaskGraphRunner* task_graph_runner_;
|
|
|
| - ScopedPtrVector<SwapPromise> swap_promise_list_;
|
| + std::vector<scoped_ptr<SwapPromise>> swap_promise_list_;
|
| std::set<SwapPromiseMonitor*> swap_promise_monitor_;
|
|
|
| PropertyTrees property_trees_;
|
|
|