Index: cc/layers/picture_layer_impl_perftest.cc |
diff --git a/cc/layers/picture_layer_impl_perftest.cc b/cc/layers/picture_layer_impl_perftest.cc |
index 72d135371a90d10ec063c7dad0f504c961d9adcc..0f9e6024df4f7062114a41d5c044167e5eed7468 100644 |
--- a/cc/layers/picture_layer_impl_perftest.cc |
+++ b/cc/layers/picture_layer_impl_perftest.cc |
@@ -63,7 +63,7 @@ class PictureLayerImplPerfTest : public testing::Test { |
LayerTreeImpl* pending_tree = host_impl_.pending_tree(); |
pending_tree->ClearLayers(); |
- scoped_ptr<FakePictureLayerImpl> pending_layer = |
+ std::unique_ptr<FakePictureLayerImpl> pending_layer = |
FakePictureLayerImpl::CreateWithRasterSource(pending_tree, 7, |
raster_source); |
pending_layer->SetDrawsContent(true); |
@@ -85,8 +85,9 @@ class PictureLayerImplPerfTest : public testing::Test { |
timer_.Reset(); |
do { |
int count = num_tiles; |
- scoped_ptr<TilingSetRasterQueueAll> queue(new TilingSetRasterQueueAll( |
- pending_layer_->picture_layer_tiling_set(), false)); |
+ std::unique_ptr<TilingSetRasterQueueAll> queue( |
+ new TilingSetRasterQueueAll( |
+ pending_layer_->picture_layer_tiling_set(), false)); |
while (count--) { |
ASSERT_TRUE(!queue->IsEmpty()) << "count: " << count; |
ASSERT_TRUE(queue->Top().tile()) << "count: " << count; |
@@ -112,8 +113,9 @@ class PictureLayerImplPerfTest : public testing::Test { |
timer_.Reset(); |
do { |
- scoped_ptr<TilingSetRasterQueueAll> queue(new TilingSetRasterQueueAll( |
- pending_layer_->picture_layer_tiling_set(), false)); |
+ std::unique_ptr<TilingSetRasterQueueAll> queue( |
+ new TilingSetRasterQueueAll( |
+ pending_layer_->picture_layer_tiling_set(), false)); |
timer_.NextLap(); |
} while (!timer_.HasTimeLimitExpired()); |
@@ -132,7 +134,7 @@ class PictureLayerImplPerfTest : public testing::Test { |
timer_.Reset(); |
do { |
int count = num_tiles; |
- scoped_ptr<TilingSetEvictionQueue> queue(new TilingSetEvictionQueue( |
+ std::unique_ptr<TilingSetEvictionQueue> queue(new TilingSetEvictionQueue( |
pending_layer_->picture_layer_tiling_set())); |
while (count--) { |
ASSERT_TRUE(!queue->IsEmpty()) << "count: " << count; |
@@ -160,7 +162,7 @@ class PictureLayerImplPerfTest : public testing::Test { |
timer_.Reset(); |
do { |
- scoped_ptr<TilingSetEvictionQueue> queue(new TilingSetEvictionQueue( |
+ std::unique_ptr<TilingSetEvictionQueue> queue(new TilingSetEvictionQueue( |
pending_layer_->picture_layer_tiling_set())); |
timer_.NextLap(); |
} while (!timer_.HasTimeLimitExpired()); |
@@ -173,7 +175,7 @@ class PictureLayerImplPerfTest : public testing::Test { |
TestSharedBitmapManager shared_bitmap_manager_; |
TestTaskGraphRunner task_graph_runner_; |
FakeImplTaskRunnerProvider task_runner_provider_; |
- scoped_ptr<OutputSurface> output_surface_; |
+ std::unique_ptr<OutputSurface> output_surface_; |
FakeLayerTreeHostImpl host_impl_; |
FakePictureLayerImpl* pending_layer_; |
LapTimer timer_; |