Convert Pass()→std::move() in ui/

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 "ui/compositor/layer_owner_delegate.h"
 
 namespace ui {
 
 LayerOwner::LayerOwner() : layer_(NULL), layer_owner_delegate_(NULL) {
 }
 
 LayerOwner::~LayerOwner() {
 }
 
 void LayerOwner::SetLayer(Layer* layer) {
   DCHECK(!OwnsLayer());
   layer_owner_.reset(layer);
   layer_ = layer;
   layer_->owner_ = this;
 }
 
 scoped_ptr<Layer> LayerOwner::AcquireLayer() {
   if (layer_owner_)
     layer_owner_->owner_ = NULL;
-  return layer_owner_.Pass();
+  return std::move(layer_owner_);
 }
 
 scoped_ptr<Layer> LayerOwner::RecreateLayer() {
   scoped_ptr<ui::Layer> old_layer(AcquireLayer());
   if (!old_layer)
-    return old_layer.Pass();
+    return old_layer;
 
   LayerDelegate* old_delegate = old_layer->delegate();
   old_layer->set_delegate(NULL);
 
   const gfx::Rect layer_bounds(old_layer->bounds());
   Layer* new_layer = new ui::Layer(old_layer->type());
   SetLayer(new_layer);
   new_layer->SetVisible(old_layer->GetTargetVisibility());
   new_layer->SetOpacity(old_layer->GetTargetOpacity());
   new_layer->SetBounds(layer_bounds);
@@ skipping 28 matching lines @@
     new_layer->Add(child);
   }
 
   // Install the delegate last so that the delegate isn't notified as we copy
   // state to the new layer.
   new_layer->set_delegate(old_delegate);
 
   if (layer_owner_delegate_)
     layer_owner_delegate_->OnLayerRecreated(old_layer.get(), new_layer);
 
-  return old_layer.Pass();
+  return old_layer;
 }
 
 void LayerOwner::DestroyLayer() {
   layer_ = NULL;
   layer_owner_.reset();
 }
 
 bool LayerOwner::OwnsLayer() const {
   return !!layer_owner_;
 }
 
 }  // namespace ui