Replace Pass() with std::move in ui/ozone

ui/ozone/platform/drm/gpu/hardware_display_controller.cc

 // Copyright 2014 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/ozone/platform/drm/gpu/hardware_display_controller.h"
 
 #include <drm.h>
 #include <string.h>
 #include <xf86drm.h>
+#include <utility>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/swap_result.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/page_flip_request.h"
 #include "ui/ozone/public/native_pixmap.h"
 
 namespace ui {
 
 namespace {
 
 void EmptyFlipCallback(gfx::SwapResult) {}
 
 }  // namespace
 
 HardwareDisplayController::HardwareDisplayController(
     scoped_ptr<CrtcController> controller,
     const gfx::Point& origin)
     : origin_(origin),
       is_disabled_(controller->is_disabled()) {
-  AddCrtc(controller.Pass());
+  AddCrtc(std::move(controller));
 }
 
 HardwareDisplayController::~HardwareDisplayController() {
   // Reset the cursor.
   UnsetCursor();
 }
 
 bool HardwareDisplayController::Modeset(const OverlayPlane& primary,
                                         drmModeModeInfo mode) {
   TRACE_EVENT0("drm", "HDC::Modeset");
@@ skipping 146 matching lines @@
   const std::vector<scoped_ptr<HardwareDisplayPlane>>& all_planes =
       drm->plane_manager()->planes();
   HardwareDisplayPlaneList* crtc_plane_list =
       owned_hardware_planes_.get(drm.get());
   uint32_t crtc = controller->crtc();
   for (const auto& plane : all_planes) {
     if (plane->in_use() && (plane->owning_crtc() == crtc))
       crtc_plane_list->old_plane_list.push_back(plane.get());
   }
 
-  crtc_controllers_.push_back(controller.Pass());
+  crtc_controllers_.push_back(std::move(controller));
 }
 
 scoped_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
     const scoped_refptr<DrmDevice>& drm,
     uint32_t crtc) {
   for (auto it = crtc_controllers_.begin(); it != crtc_controllers_.end();
        ++it) {
     if ((*it)->drm() == drm && (*it)->crtc() == crtc) {
       scoped_ptr<CrtcController> controller(std::move(*it));
       crtc_controllers_.erase(it);
@@ skipping 13 matching lines @@
             owned_hardware_planes_.get(drm.get());
         all_planes.swap(plane_list->old_plane_list);
         for (auto* plane : all_planes) {
           if (plane->owning_crtc() != crtc)
             plane_list->old_plane_list.push_back(plane);
         }
       } else {
         owned_hardware_planes_.erase(controller->drm().get());
       }
 
-      return controller.Pass();
+      return controller;
     }
   }
 
   return nullptr;
 }
 
 bool HardwareDisplayController::HasCrtc(const scoped_refptr<DrmDevice>& drm,
                                         uint32_t crtc) const {
   for (const auto& controller : crtc_controllers_) {
     if (controller->drm() == drm && controller->crtc() == crtc)
@@ skipping 29 matching lines @@
 
 scoped_refptr<DrmDevice> HardwareDisplayController::GetAllocationDrmDevice()
     const {
   DCHECK(!crtc_controllers_.empty());
   // TODO(dnicoara) When we support mirroring across DRM devices, figure out
   // which device should be used for allocations.
   return crtc_controllers_[0]->drm();
 }
 
 }  // namespace ui