Re-write many calls to WrapUnique() with MakeUnique()

ui/compositor/layer_owner.cc

 // Copyright (c) 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.
 
 #include "ui/compositor/layer_owner.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "ui/compositor/layer_owner_delegate.h"
@@ skipping 37 matching lines @@
   new_layer->set_name(old_layer->name());
   new_layer->SetFillsBoundsOpaquely(old_layer->fills_bounds_opaquely());
   new_layer->SetFillsBoundsCompletely(old_layer->FillsBoundsCompletely());
   new_layer->SetSubpixelPositionOffset(old_layer->subpixel_position_offset());
   new_layer->SetLayerInverted(old_layer->layer_inverted());
   new_layer->SetTransform(old_layer->GetTargetTransform());
   if (old_layer->type() == LAYER_SOLID_COLOR)
     new_layer->SetColor(old_layer->GetTargetColor());
   SkRegion* alpha_shape = old_layer->alpha_shape();
   if (alpha_shape)
-    new_layer->SetAlphaShape(base::WrapUnique(new SkRegion(*alpha_shape)));
+    new_layer->SetAlphaShape(base::MakeUnique<SkRegion>(*alpha_shape));
 
   if (old_layer->parent()) {
     // Install new layer as a sibling of the old layer, stacked below it.
     old_layer->parent()->Add(new_layer);
     old_layer->parent()->StackBelow(new_layer, old_layer.get());
   } else if (old_layer->GetCompositor()) {
     // If old_layer was the layer tree root then we need to move the Compositor
     // over to the new root.
     old_layer->GetCompositor()->SetRootLayer(new_layer);
   }
@@ skipping 21 matching lines @@
 void LayerOwner::DestroyLayer() {
   layer_ = NULL;
   layer_owner_.reset();
 }
 
 bool LayerOwner::OwnsLayer() const {
   return !!layer_owner_;
 }
 
 }  // namespace ui