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

cc/layers/layer_impl.h

 // Copyright 2011 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "cc/animation/target_property.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
 #include "cc/base/synced_property.h"
 #include "cc/debug/frame_timing_request.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/draw_properties.h"
 #include "cc/layers/layer_collections.h"
 #include "cc/layers/layer_position_constraint.h"
@@ skipping 46 matching lines @@
 };
 
 class CC_EXPORT LayerImpl {
  public:
   typedef LayerImplList RenderSurfaceListType;
   typedef LayerImplList LayerListType;
   typedef RenderSurfaceImpl RenderSurfaceType;
 
   enum RenderingContextConstants { NO_RENDERING_CONTEXT = 0 };
 
-  static scoped_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, int id) {
-    return make_scoped_ptr(new LayerImpl(tree_impl, id));
+  static std::unique_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, int id) {
+    return base::WrapUnique(new LayerImpl(tree_impl, id));
   }
 
   virtual ~LayerImpl();
 
   int id() const { return layer_id_; }
 
   // Interactions with attached animations.
   gfx::ScrollOffset ScrollOffsetForAnimation() const;
   void OnFilterAnimated(const FilterOperations& filters);
   void OnOpacityAnimated(float opacity);
   void OnTransformAnimated(const gfx::Transform& transform);
   void OnScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset);
   void OnTransformIsPotentiallyAnimatingChanged(bool is_animating);
   bool IsActive() const;
   bool OpacityCanAnimateOnImplThread() const { return false; }
 
   // Tree structure.
   LayerImpl* parent() { return parent_; }
   LayerImplList& children() { return children_; }
   LayerImpl* child_at(size_t index) const { return children_[index]; }
-  void AddChild(scoped_ptr<LayerImpl> child);
-  scoped_ptr<LayerImpl> RemoveChildForTesting(LayerImpl* child);
+  void AddChild(std::unique_ptr<LayerImpl> child);
+  std::unique_ptr<LayerImpl> RemoveChildForTesting(LayerImpl* child);
   void SetParent(LayerImpl* parent);
 
   void SetScrollParent(LayerImpl* parent);
 
   LayerImpl* scroll_parent() { return scroll_parent_; }
   const LayerImpl* scroll_parent() const { return scroll_parent_; }
 
   void SetScrollChildren(std::set<LayerImpl*>* children);
 
   std::set<LayerImpl*>* scroll_children() { return scroll_children_.get(); }
@@ skipping 54 matching lines @@
     return clip_parent_;
   }
 
   void SetClipChildren(std::set<LayerImpl*>* children);
 
   std::set<LayerImpl*>* clip_children() { return clip_children_.get(); }
   const std::set<LayerImpl*>* clip_children() const {
     return clip_children_.get();
   }
 
-  void PassCopyRequests(std::vector<scoped_ptr<CopyOutputRequest>>* requests);
+  void PassCopyRequests(
+      std::vector<std::unique_ptr<CopyOutputRequest>>* requests);
   // Can only be called when the layer has a copy request.
   void TakeCopyRequestsAndTransformToTarget(
-      std::vector<scoped_ptr<CopyOutputRequest>>* request);
+      std::vector<std::unique_ptr<CopyOutputRequest>>* request);
   bool HasCopyRequest() const { return !copy_requests_.empty(); }
   bool InsideCopyRequest() const;
 
-  void SetMaskLayer(scoped_ptr<LayerImpl> mask_layer);
+  void SetMaskLayer(std::unique_ptr<LayerImpl> mask_layer);
   LayerImpl* mask_layer() { return mask_layer_; }
   const LayerImpl* mask_layer() const { return mask_layer_; }
-  scoped_ptr<LayerImpl> TakeMaskLayer();
+  std::unique_ptr<LayerImpl> TakeMaskLayer();
 
-  void SetReplicaLayer(scoped_ptr<LayerImpl> replica_layer);
+  void SetReplicaLayer(std::unique_ptr<LayerImpl> replica_layer);
   LayerImpl* replica_layer() { return replica_layer_; }
   const LayerImpl* replica_layer() const { return replica_layer_; }
-  scoped_ptr<LayerImpl> TakeReplicaLayer();
+  std::unique_ptr<LayerImpl> TakeReplicaLayer();
 
   bool has_mask() const { return !!mask_layer_; }
   bool has_replica() const { return !!replica_layer_; }
   bool replica_has_mask() const {
     return replica_layer_ && (mask_layer_ || replica_layer_->mask_layer_);
   }
 
   LayerTreeImpl* layer_tree_impl() const { return layer_tree_impl_; }
 
   void PopulateSharedQuadState(SharedQuadState* state) const;
@@ skipping 306 matching lines @@
   virtual void DidBeginTracing();
 
   // Release resources held by this layer. Called when the output surface
   // that rendered this layer was lost or a rendering mode switch has occured.
   virtual void ReleaseResources();
 
   // Recreate resources that are required after they were released by a
   // ReleaseResources call.
   virtual void RecreateResources();
 
-  virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl);
+  virtual std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl);
   virtual void PushPropertiesTo(LayerImpl* layer);
 
   virtual void GetAllPrioritizedTilesForTracing(
       std::vector<PrioritizedTile>* prioritized_tiles) const;
   virtual void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   virtual size_t GPUMemoryUsageInBytes() const;
 
   void SetNeedsPushProperties();
 
   virtual void RunMicroBenchmark(MicroBenchmarkImpl* benchmark);
 
   void SetDebugInfo(
-      scoped_ptr<base::trace_event::ConvertableToTraceFormat> debug_info);
+      std::unique_ptr<base::trace_event::ConvertableToTraceFormat> debug_info);
 
   bool IsDrawnRenderSurfaceLayerListMember() const;
 
   void Set3dSortingContextId(int id);
   int sorting_context_id() { return sorting_context_id_; }
 
   void SetFrameTimingRequests(
       const std::vector<FrameTimingRequest>& frame_timing_requests);
   const std::vector<FrameTimingRequest>& frame_timing_requests() const {
     return frame_timing_requests_;
@@ skipping 85 matching lines @@
   // Properties internal to LayerImpl
   LayerImpl* parent_;
   LayerImplList children_;
 
   LayerImpl* scroll_parent_;
 
   // Storing a pointer to a set rather than a set since this will be rarely
   // used. If this pointer turns out to be too heavy, we could have this (and
   // the scroll parent above) be stored in a LayerImpl -> scroll_info
   // map somewhere.
-  scoped_ptr<std::set<LayerImpl*>> scroll_children_;
+  std::unique_ptr<std::set<LayerImpl*>> scroll_children_;
 
   LayerImpl* clip_parent_;
-  scoped_ptr<std::set<LayerImpl*>> clip_children_;
+  std::unique_ptr<std::set<LayerImpl*>> clip_children_;
 
   // mask_layer_ can be temporarily stolen during tree sync, we need this ID to
   // confirm newly assigned layer is still the previous one
   int mask_layer_id_;
   LayerImpl* mask_layer_;
   int replica_layer_id_;  // ditto
   LayerImpl* replica_layer_;
   int layer_id_;
   LayerTreeImpl* layer_tree_impl_;
 
@@ skipping 83 matching lines @@
   uint32_t mutable_properties_;
   // Rect indicating what was repainted/updated during update.
   // Note that plugin layers bypass this and leave it empty.
   // This is in the layer's space.
   gfx::Rect update_rect_;
 
   // Denotes an area that is damaged and needs redraw. This is in the layer's
   // space.
   gfx::Rect damage_rect_;
 
-  std::vector<scoped_ptr<CopyOutputRequest>> copy_requests_;
+  std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_;
 
   // Group of properties that need to be computed based on the layer tree
   // hierarchy before layers can be drawn.
   DrawProperties draw_properties_;
   PerformanceProperties<LayerImpl> performance_properties_;
 
-  scoped_ptr<base::trace_event::ConvertableToTraceFormat> owned_debug_info_;
+  std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
+      owned_debug_info_;
   base::trace_event::ConvertableToTraceFormat* debug_info_;
-  scoped_ptr<RenderSurfaceImpl> render_surface_;
+  std::unique_ptr<RenderSurfaceImpl> render_surface_;
 
   bool force_render_surface_;
 
   std::vector<FrameTimingRequest> frame_timing_requests_;
   bool frame_timing_requests_dirty_;
   bool layer_or_descendant_is_drawn_;
   // If true, the layer or one of its descendants has a touch handler.
   bool layer_or_descendant_has_touch_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_