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

cc/trees/layer_tree_impl.h

 // Copyright 2012 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_TREES_LAYER_TREE_IMPL_H_
 #define CC_TREES_LAYER_TREE_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "cc/base/synced_property.h"
 #include "cc/input/event_listener_properties.h"
 #include "cc/input/layer_selection_bound.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/layer_list_iterator.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/renderer.h"
 #include "cc/output/swap_promise.h"
 #include "cc/resources/ui_resource_client.h"
@@ skipping 32 matching lines @@
 
 typedef std::vector<UIResourceRequest> UIResourceRequestQueue;
 typedef SyncedProperty<AdditionGroup<float>> SyncedTopControls;
 typedef SyncedProperty<AdditionGroup<gfx::Vector2dF>> SyncedElasticOverscroll;
 
 class CC_EXPORT LayerTreeImpl {
  public:
   // This is the number of times a fixed point has to be hit contiuously by a
   // layer to consider it as jittering.
   const int kFixedPointHitsThreshold = 3;
-  static scoped_ptr<LayerTreeImpl> create(
+  static std::unique_ptr<LayerTreeImpl> create(
       LayerTreeHostImpl* layer_tree_host_impl,
       scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor,
       scoped_refptr<SyncedTopControls> top_controls_shown_ratio,
       scoped_refptr<SyncedElasticOverscroll> elastic_overscroll) {
-    return make_scoped_ptr(
+    return base::WrapUnique(
         new LayerTreeImpl(layer_tree_host_impl, page_scale_factor,
                           top_controls_shown_ratio, elastic_overscroll));
   }
   virtual ~LayerTreeImpl();
 
   void Shutdown();
   void ReleaseResources();
   void RecreateResources();
 
   // Methods called by the layer tree that pass-through or access LTHI.
@@ skipping 15 matching lines @@
   bool IsRecycleTree() const;
   bool IsSyncTree() const;
   LayerImpl* FindActiveTreeLayerById(int id);
   LayerImpl* FindPendingTreeLayerById(int id);
   bool PinchGestureActive() const;
   BeginFrameArgs CurrentBeginFrameArgs() const;
   base::TimeDelta CurrentBeginFrameInterval() const;
   gfx::Rect DeviceViewport() const;
   gfx::Size DrawViewportSize() const;
   const gfx::Rect ViewportRectForTilePriority() const;
-  scoped_ptr<ScrollbarAnimationController> CreateScrollbarAnimationController(
-      int scroll_layer_id);
+  std::unique_ptr<ScrollbarAnimationController>
+  CreateScrollbarAnimationController(int scroll_layer_id);
   void DidAnimateScrollOffset();
   bool use_gpu_rasterization() const;
   GpuRasterizationStatus GetGpuRasterizationStatus() const;
   bool create_low_res_tiling() const;
   bool RequiresHighResToDraw() const;
   bool SmoothnessTakesPriority() const;
   VideoFrameControllerClient* GetVideoFrameControllerClient() const;
   AnimationHost* animation_host() const {
     return layer_tree_host_impl_->animation_host();
   }
 
   // Tree specific methods exposed to layer-impl tree.
   // ---------------------------------------------------------------------------
   void SetNeedsRedraw();
 
   // Tracing methods.
   // ---------------------------------------------------------------------------
   void GetAllPrioritizedTilesForTracing(
       std::vector<PrioritizedTile>* prioritized_tiles) const;
   void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   // Other public methods
   // ---------------------------------------------------------------------------
   LayerImpl* root_layer() const { return root_layer_; }
-  void SetRootLayer(scoped_ptr<LayerImpl>);
+  void SetRootLayer(std::unique_ptr<LayerImpl>);
   bool IsRootLayer(const LayerImpl* layer) const;
-  scoped_ptr<OwnedLayerImplList> DetachLayers();
+  std::unique_ptr<OwnedLayerImplList> DetachLayers();
   void ClearLayers();
 
   void SetPropertyTrees(const PropertyTrees property_trees) {
     property_trees_ = property_trees;
     property_trees_.is_main_thread = false;
     property_trees_.is_active = IsActiveTree();
     property_trees_.transform_tree.set_source_to_parent_updates_allowed(false);
   }
   PropertyTrees* property_trees() { return &property_trees_; }
 
@@ skipping 156 matching lines @@
   void AddLayerShouldPushProperties(LayerImpl* layer);
   void RemoveLayerShouldPushProperties(LayerImpl* layer);
   std::unordered_set<LayerImpl*>& LayersThatShouldPushProperties();
   bool LayerNeedsPushPropertiesForTesting(LayerImpl* layer);
 
   // These should be called by LayerImpl's ctor/dtor.
   void RegisterLayer(LayerImpl* layer);
   void UnregisterLayer(LayerImpl* layer);
 
   // These manage ownership of the LayerImpl.
-  void AddLayer(scoped_ptr<LayerImpl> layer);
-  scoped_ptr<LayerImpl> RemoveLayer(int id);
+  void AddLayer(std::unique_ptr<LayerImpl> layer);
+  std::unique_ptr<LayerImpl> RemoveLayer(int id);
 
   size_t NumLayers();
 
   void DidBecomeActive();
 
   // Set on the active tree when the viewport size recently changed
   // and the active tree's size is now out of date.
   bool ViewportSizeInvalid() const;
   void SetViewportSizeInvalid();
   void ResetViewportSizeInvalid();
@@ skipping 11 matching lines @@
 
   // Call this function when you expect there to be a swap buffer.
   // See swap_promise.h for how to use SwapPromise.
   //
   // A swap promise queued by QueueSwapPromise travels with the layer
   // information currently associated with the tree. For example, when
   // a pending tree is activated, the swap promise is passed to the
   // active tree along with the layer information. Similarly, when a
   // new activation overwrites layer information on the active tree,
   // queued swap promises are broken.
-  void QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise);
+  void QueueSwapPromise(std::unique_ptr<SwapPromise> swap_promise);
 
   // Queue a swap promise, pinned to this tree. Pinned swap promises
   // may only be queued on the active tree.
   //
   // An active tree pinned swap promise will see only DidSwap() or
   // DidNotSwap(SWAP_FAILS). No DidActivate() will be seen because
   // that has already happened prior to queueing of the swap promise.
   //
   // Pinned active tree swap promises will not be broken prematurely
   // on the active tree if a new tree is activated.
-  void QueuePinnedSwapPromise(scoped_ptr<SwapPromise> swap_promise);
+  void QueuePinnedSwapPromise(std::unique_ptr<SwapPromise> swap_promise);
 
   // Take the |new_swap_promise| and append it to |swap_promise_list_|.
-  void PassSwapPromises(std::vector<scoped_ptr<SwapPromise>>* new_swap_promise);
+  void PassSwapPromises(
+      std::vector<std::unique_ptr<SwapPromise>>* new_swap_promise);
   void FinishSwapPromises(CompositorFrameMetadata* metadata);
   void BreakSwapPromises(SwapPromise::DidNotSwapReason reason);
 
   void DidModifyTilePriorities();
 
   ResourceId ResourceIdForUIResource(UIResourceId uid) const;
   void ProcessUIResourceRequestQueue();
 
   bool IsUIResourceOpaque(UIResourceId uid) const;
 
@@ skipping 46 matching lines @@
   }
   bool SetCurrentTopControlsShownRatio(float ratio);
   float CurrentTopControlsShownRatio() const {
     return top_controls_shown_ratio_->Current(IsActiveTree());
   }
   void set_top_controls_height(float top_controls_height);
   float top_controls_height() const { return top_controls_height_; }
   void PushTopControlsFromMainThread(float top_controls_shown_ratio);
 
   void SetPendingPageScaleAnimation(
-      scoped_ptr<PendingPageScaleAnimation> pending_animation);
-  scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation();
+      std::unique_ptr<PendingPageScaleAnimation> pending_animation);
+  std::unique_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation();
 
   void GatherFrameTimingRequestIds(std::vector<int64_t>* request_ids);
 
   void DidUpdateScrollOffset(int layer_id, int transform_id);
   void DidUpdateScrollState(int layer_id);
 
   bool IsAnimatingFilterProperty(const LayerImpl* layer) const;
   bool IsAnimatingOpacityProperty(const LayerImpl* layer) const;
   bool IsAnimatingTransformProperty(const LayerImpl* layer) const;
 
@@ skipping 81 matching lines @@
 
   scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_;
   float min_page_scale_factor_;
   float max_page_scale_factor_;
 
   float device_scale_factor_;
   float painted_device_scale_factor_;
 
   scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
 
-  scoped_ptr<OwnedLayerImplList> layers_;
+  std::unique_ptr<OwnedLayerImplList> layers_;
   LayerImplMap layer_id_map_;
   // Set of layers that need to push properties.
   std::unordered_set<LayerImpl*> layers_that_should_push_properties_;
 
   std::unordered_map<uint64_t, ElementLayers> element_layers_map_;
 
   // Maps from clip layer ids to scroll layer ids.  Note that this only includes
   // the subset of clip layers that act as scrolling containers.  (This is
   // derived from LayerImpl::scroll_clip_layer_ and exists to avoid O(n) walks.)
   std::unordered_map<int, int> clip_scroll_map_;
@@ skipping 18 matching lines @@
   bool needs_update_draw_properties_;
 
   // In impl-side painting mode, this is true when the tree may contain
   // structural differences relative to the active tree.
   bool needs_full_tree_sync_;
 
   bool next_activation_forces_redraw_;
 
   bool has_ever_been_drawn_;
 
-  std::vector<scoped_ptr<SwapPromise>> swap_promise_list_;
-  std::vector<scoped_ptr<SwapPromise>> pinned_swap_promise_list_;
+  std::vector<std::unique_ptr<SwapPromise>> swap_promise_list_;
+  std::vector<std::unique_ptr<SwapPromise>> pinned_swap_promise_list_;
 
   UIResourceRequestQueue ui_resource_request_queue_;
 
   int render_surface_layer_list_id_;
 
   bool have_scroll_event_handlers_;
   EventListenerProperties event_listener_properties_[static_cast<size_t>(
       EventListenerClass::kNumClasses)];
 
   // Whether or not Blink's viewport size was shrunk by the height of the top
   // controls at the time of the last layout.
   bool top_controls_shrink_blink_size_;
   float top_controls_height_;
 
   // The amount that the top controls are shown from 0 (hidden) to 1 (fully
   // shown).
   scoped_refptr<SyncedTopControls> top_controls_shown_ratio_;
 
-  scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
+  std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_IMPL_H_