Convert //cc from scoped_ptr to std::unique_ptr.

cc/tiles/raster_tile_priority_queue_all.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/tiles/raster_tile_priority_queue_all.h"
 
+#include "base/memory/ptr_util.h"
 #include "cc/tiles/tiling_set_raster_queue_all.h"
 
 namespace cc {
 
 namespace {
 
 class RasterOrderComparator {
  public:
   explicit RasterOrderComparator(TreePriority tree_priority)
       : tree_priority_(tree_priority) {}
 
-  bool operator()(const scoped_ptr<TilingSetRasterQueueAll>& a_queue,
-                  const scoped_ptr<TilingSetRasterQueueAll>& b_queue) const {
+  bool operator()(
+      const std::unique_ptr<TilingSetRasterQueueAll>& a_queue,
+      const std::unique_ptr<TilingSetRasterQueueAll>& b_queue) const {
     // Note that in this function, we have to return true if and only if
     // a is strictly lower priority than b.
     const TilePriority& a_priority = a_queue->Top().priority();
     const TilePriority& b_priority = b_queue->Top().priority();
     bool prioritize_low_res = tree_priority_ == SMOOTHNESS_TAKES_PRIORITY;
 
     // If the bin is the same but the resolution is not, then the order will be
     // determined by whether we prioritize low res or not.
     // TODO(vmpstr): Remove this when TilePriority is no longer a member of Tile
     // class but instead produced by the iterators.
@@ skipping 14 matching lines @@
     return b_priority.IsHigherPriorityThan(a_priority);
   }
 
  private:
   TreePriority tree_priority_;
 };
 
 void CreateTilingSetRasterQueues(
     const std::vector<PictureLayerImpl*>& layers,
     TreePriority tree_priority,
-    std::vector<scoped_ptr<TilingSetRasterQueueAll>>* queues) {
+    std::vector<std::unique_ptr<TilingSetRasterQueueAll>>* queues) {
   DCHECK(queues->empty());
 
   for (auto* layer : layers) {
     if (!layer->HasValidTilePriorities())
       continue;
 
     PictureLayerTilingSet* tiling_set = layer->picture_layer_tiling_set();
     bool prioritize_low_res = tree_priority == SMOOTHNESS_TAKES_PRIORITY;
-    scoped_ptr<TilingSetRasterQueueAll> tiling_set_queue = make_scoped_ptr(
-        new TilingSetRasterQueueAll(tiling_set, prioritize_low_res));
+    std::unique_ptr<TilingSetRasterQueueAll> tiling_set_queue =
+        base::WrapUnique(
+            new TilingSetRasterQueueAll(tiling_set, prioritize_low_res));
     // Queues will only contain non empty tiling sets.
     if (!tiling_set_queue->IsEmpty())
       queues->push_back(std::move(tiling_set_queue));
   }
   std::make_heap(queues->begin(), queues->end(),
                  RasterOrderComparator(tree_priority));
 }
 
 }  // namespace
 
@@ skipping 34 matching lines @@
 
   // Remove empty queues.
   if (queue->IsEmpty()) {
     next_queues.pop_back();
   } else {
     std::push_heap(next_queues.begin(), next_queues.end(),
                    RasterOrderComparator(tree_priority_));
   }
 }
 
-std::vector<scoped_ptr<TilingSetRasterQueueAll>>&
+std::vector<std::unique_ptr<TilingSetRasterQueueAll>>&
 RasterTilePriorityQueueAll::GetNextQueues() {
   const auto* const_this = static_cast<const RasterTilePriorityQueueAll*>(this);
   const auto& const_queues = const_this->GetNextQueues();
-  return const_cast<std::vector<scoped_ptr<TilingSetRasterQueueAll>>&>(
+  return const_cast<std::vector<std::unique_ptr<TilingSetRasterQueueAll>>&>(
       const_queues);
 }
 
-const std::vector<scoped_ptr<TilingSetRasterQueueAll>>&
+const std::vector<std::unique_ptr<TilingSetRasterQueueAll>>&
 RasterTilePriorityQueueAll::GetNextQueues() const {
   DCHECK(!IsEmpty());
 
   // If we only have one queue with tiles, return it.
   if (active_queues_.empty())
     return pending_queues_;
   if (pending_queues_.empty())
     return active_queues_;
 
   const PrioritizedTile& active_tile = active_queues_.front()->Top();
@@ skipping 30 matching lines @@
         return active_queues_;
       return pending_queues_;
     }
     default:
       NOTREACHED();
       return active_queues_;
   }
 }
 
 }  // namespace cc