| Index: cc/resources/tile_manager_perftest.cc
|
| diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
|
| index 911e5c9b34f4362cfecb048faf8a23bee008c2a7..14b1d18d2b22128bea966b8e212351af7c54a421 100644
|
| --- a/cc/resources/tile_manager_perftest.cc
|
| +++ b/cc/resources/tile_manager_perftest.cc
|
| @@ -180,9 +180,8 @@ class TileManagerPerfTest : public testing::Test {
|
|
|
| timer_.Reset();
|
| do {
|
| - RasterTilePriorityQueue queue;
|
| - host_impl_.BuildRasterQueue(&queue, priorities[priority_count],
|
| - RasterTilePriorityQueue::Type::ALL);
|
| + scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
|
| + priorities[priority_count], RasterTilePriorityQueue::Type::ALL));
|
| priority_count = (priority_count + 1) % arraysize(priorities);
|
| timer_.NextLap();
|
| } while (!timer_.HasTimeLimitExpired());
|
| @@ -211,13 +210,12 @@ class TileManagerPerfTest : public testing::Test {
|
| timer_.Reset();
|
| do {
|
| int count = tile_count;
|
| - RasterTilePriorityQueue queue;
|
| - host_impl_.BuildRasterQueue(&queue, priorities[priority_count],
|
| - RasterTilePriorityQueue::Type::ALL);
|
| + scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
|
| + priorities[priority_count], RasterTilePriorityQueue::Type::ALL));
|
| while (count--) {
|
| - ASSERT_FALSE(queue.IsEmpty());
|
| - ASSERT_TRUE(queue.Top() != NULL);
|
| - queue.Pop();
|
| + ASSERT_FALSE(queue->IsEmpty());
|
| + ASSERT_TRUE(queue->Top() != NULL);
|
| + queue->Pop();
|
| }
|
| priority_count = (priority_count + 1) % arraysize(priorities);
|
| timer_.NextLap();
|
|
|