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

Remove it completely when copy ellision can take care of it.

BUG=557422

Review URL: https://codereview.chromium.org/1528373002

Cr-Commit-Position: refs/heads/master@{#366354}

24 files changed, 75 insertions, 47 deletions

diff --git a/ui/ozone/demo/ozone_demo.cc b/ui/ozone/demo/ozone_demo.cc
index 7780016..61782e4a 100644
--- a/ui/ozone/demo/ozone_demo.cc
+++ b/ui/ozone/demo/ozone_demo.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <utility>
+
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
@@ -311,7 +313,7 @@ void WindowManager::OnDisplayConfigured(const gfx::Rect& bounds, bool success) {
     scoped_ptr<DemoWindow> window(
         new DemoWindow(this, &renderer_factory_, bounds));
     window->Start();
-    windows_.push_back(window.Pass());
+    windows_.push_back(std::move(window));
   } else {
     LOG(ERROR) << "Failed to configure display at " << bounds.ToString();
   }
diff --git a/ui/ozone/platform/caca/caca_window_manager.cc b/ui/ozone/platform/caca/caca_window_manager.cc
index 2b5a5d2..843fd2d 100644
--- a/ui/ozone/platform/caca/caca_window_manager.cc
+++ b/ui/ozone/platform/caca/caca_window_manager.cc
@@ -137,7 +137,7 @@ scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget(
   scoped_ptr<CacaSurface> canvas(new CacaSurface(window));
   bool initialized = canvas->Initialize();
   DCHECK(initialized);
-  return canvas.Pass();
+  return canvas;
 }
 
 }  // namespace ui
diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc
index 2a9f4c0..1df1ff6 100644
--- a/ui/ozone/platform/caca/ozone_platform_caca.cc
+++ b/ui/ozone/platform/caca/ozone_platform_caca.cc
@@ -56,7 +56,7 @@ class OzonePlatformCaca : public OzonePlatform {
         delegate, window_manager_.get(), event_source_.get(), bounds));
     if (!caca_window->Initialize())
       return nullptr;
-    return caca_window.Pass();
+    return caca_window;
   }
   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
     return make_scoped_ptr(new NativeDisplayDelegateOzone());
diff --git a/ui/ozone/platform/cast/ozone_platform_cast.cc b/ui/ozone/platform/cast/ozone_platform_cast.cc
index ec9f8a1..a0e282c 100644
--- a/ui/ozone/platform/cast/ozone_platform_cast.cc
+++ b/ui/ozone/platform/cast/ozone_platform_cast.cc
@@ -4,6 +4,8 @@
 
 #include "ui/ozone/platform/cast/ozone_platform_cast.h"
 
+#include <utility>
+
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chromecast/public/cast_egl_platform.h"
@@ -37,7 +39,7 @@ base::LazyInstance<scoped_ptr<GpuPlatformSupport>> g_gpu_platform_support =
 class OzonePlatformCast : public OzonePlatform {
  public:
   explicit OzonePlatformCast(scoped_ptr<CastEglPlatform> egl_platform)
-      : egl_platform_(egl_platform.Pass()) {}
+      : egl_platform_(std::move(egl_platform)) {}
   ~OzonePlatformCast() override {}
 
   // OzonePlatform implementation:
@@ -87,7 +89,7 @@ class OzonePlatformCast : public OzonePlatform {
       surface_factory_.reset(new SurfaceFactoryCast());
   }
   void InitializeGPU() override {
-    surface_factory_.reset(new SurfaceFactoryCast(egl_platform_.Pass()));
+    surface_factory_.reset(new SurfaceFactoryCast(std::move(egl_platform_)));
     g_gpu_platform_support.Get() =
         make_scoped_ptr(new GpuPlatformSupportCast(surface_factory_.get()));
   }
@@ -110,7 +112,7 @@ OzonePlatform* CreateOzonePlatformCast() {
       base::CommandLine::ForCurrentProcess()->argv();
   scoped_ptr<chromecast::CastEglPlatform> platform(
       chromecast::CastEglPlatformShlib::Create(argv));
-  return new OzonePlatformCast(platform.Pass());
+  return new OzonePlatformCast(std::move(platform));
 }
 
 }  // namespace ui
diff --git a/ui/ozone/platform/cast/surface_factory_cast.cc b/ui/ozone/platform/cast/surface_factory_cast.cc
index f92e1c9..01ae9f7 100644
--- a/ui/ozone/platform/cast/surface_factory_cast.cc
+++ b/ui/ozone/platform/cast/surface_factory_cast.cc
@@ -6,6 +6,7 @@
 
 #include <dlfcn.h>
 #include <EGL/egl.h>
+#include <utility>
 
 #include "base/callback_helpers.h"
 #include "chromecast/public/cast_egl_platform.h"
@@ -76,8 +77,7 @@ SurfaceFactoryCast::SurfaceFactoryCast(scoped_ptr<CastEglPlatform> egl_platform)
       window_(0),
       display_size_(GetInitialDisplaySize()),
       new_display_size_(GetInitialDisplaySize()),
-      egl_platform_(egl_platform.Pass()) {
-}
+      egl_platform_(std::move(egl_platform)) {}
 
 SurfaceFactoryCast::~SurfaceFactoryCast() {
   ShutdownHardware();
diff --git a/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc b/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc
index 4a09465..01ce8ce 100644
--- a/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc
+++ b/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc
@@ -4,6 +4,8 @@
 
 #include "ui/ozone/platform/drm/client_native_pixmap_factory_gbm.h"
 
+#include <utility>
+
 #include "ui/gfx/native_pixmap_handle_ozone.h"
 #include "ui/ozone/public/client_native_pixmap_factory.h"  // nogncheck
 
@@ -41,7 +43,7 @@ class ClientNativePixmapFactoryGbm : public ClientNativePixmapFactory {
     // It's called in IO thread. We rely on clients for thread-safety.
     // Switching to an IPC message filter ensures thread-safety.
     DCHECK_LT(vgem_fd_.get(), 0);
-    vgem_fd_ = device_fd.Pass();
+    vgem_fd_ = std::move(device_fd);
 #endif
   }
   bool IsConfigurationSupported(gfx::BufferFormat format,
diff --git a/ui/ozone/platform/drm/common/drm_util.cc b/ui/ozone/platform/drm/common/drm_util.cc
index 57f3488..dee88d8 100644
--- a/ui/ozone/platform/drm/common/drm_util.cc
+++ b/ui/ozone/platform/drm/common/drm_util.cc
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <xf86drmMode.h>
+#include <utility>
 
 #include "ui/display/util/edid_parser.h"
 
@@ -108,7 +109,7 @@ int GetDrmProperty(int fd,
       continue;
 
     if (name == tmp->name) {
-      *property = tmp.Pass();
+      *property = std::move(tmp);
       return i;
     }
   }
@@ -162,7 +163,7 @@ HardwareDisplayControllerInfo::HardwareDisplayControllerInfo(
     ScopedDrmConnectorPtr connector,
     ScopedDrmCrtcPtr crtc,
     size_t index)
-    : connector_(connector.Pass()), crtc_(crtc.Pass()), index_(index) {}
+    : connector_(std::move(connector)), crtc_(std::move(crtc)), index_(index) {}
 
 HardwareDisplayControllerInfo::~HardwareDisplayControllerInfo() {
 }
@@ -186,11 +187,11 @@ ScopedVector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
       continue;
 
     ScopedDrmCrtcPtr crtc(drmModeGetCrtc(fd, crtc_id));
-    displays.push_back(
-        new HardwareDisplayControllerInfo(connector.Pass(), crtc.Pass(), i));
+    displays.push_back(new HardwareDisplayControllerInfo(std::move(connector),
+                                                         std::move(crtc), i));
   }
 
-  return displays.Pass();
+  return displays;
 }
 
 bool SameMode(const drmModeModeInfo& lhs, const drmModeModeInfo& rhs) {
diff --git a/ui/ozone/platform/drm/gpu/drm_device.cc b/ui/ozone/platform/drm/gpu/drm_device.cc
index 9a16a95..15e2b3a 100644
--- a/ui/ozone/platform/drm/gpu/drm_device.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device.cc
@@ -9,6 +9,7 @@
 #include <unistd.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ -215,7 +216,7 @@ DrmDevice::DrmDevice(const base::FilePath& device_path,
                      base::File file,
                      bool is_primary_device)
     : device_path_(device_path),
-      file_(file.Pass()),
+      file_(std::move(file)),
       page_flip_manager_(new PageFlipManager()),
       is_primary_device_(is_primary_device) {}
 
@@ -370,7 +371,7 @@ ScopedDrmPropertyPtr DrmDevice::GetProperty(drmModeConnector* connector,
       continue;
 
     if (strcmp(property->name, name) == 0)
-      return property.Pass();
+      return property;
   }
 
   return ScopedDrmPropertyPtr();
diff --git a/ui/ozone/platform/drm/gpu/drm_device_generator.cc b/ui/ozone/platform/drm/gpu/drm_device_generator.cc
index d1bde61..ec26f87 100644
--- a/ui/ozone/platform/drm/gpu/drm_device_generator.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device_generator.cc
@@ -4,6 +4,8 @@
 
 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
 
+#include <utility>
+
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
@@ -19,7 +21,7 @@ scoped_refptr<DrmDevice> DrmDeviceGenerator::CreateDevice(
     base::File file,
     bool is_primary_device) {
   scoped_refptr<DrmDevice> drm =
-      new DrmDevice(device_path, file.Pass(), is_primary_device);
+      new DrmDevice(device_path, std::move(file), is_primary_device);
   if (drm->Initialize(false))
     return drm;
 
diff --git a/ui/ozone/platform/drm/gpu/drm_device_manager.cc b/ui/ozone/platform/drm/gpu/drm_device_manager.cc
index c366f65..c4f3304 100644
--- a/ui/ozone/platform/drm/gpu/drm_device_manager.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device_manager.cc
@@ -4,6 +4,8 @@
 
 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
 
+#include <utility>
+
 #include "base/file_descriptor_posix.h"
 #include "base/single_thread_task_runner.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
@@ -29,8 +31,7 @@ class FindByDevicePath {
 
 DrmDeviceManager::DrmDeviceManager(
     scoped_ptr<DrmDeviceGenerator> drm_device_generator)
-    : drm_device_generator_(drm_device_generator.Pass()) {
-}
+    : drm_device_generator_(std::move(drm_device_generator)) {}
 
 DrmDeviceManager::~DrmDeviceManager() {
   DCHECK(drm_device_map_.empty());
@@ -46,8 +47,8 @@ bool DrmDeviceManager::AddDrmDevice(const base::FilePath& path,
     return false;
   }
 
-  scoped_refptr<DrmDevice> device =
-      drm_device_generator_->CreateDevice(path, file.Pass(), !primary_device_);
+  scoped_refptr<DrmDevice> device = drm_device_generator_->CreateDevice(
+      path, std::move(file), !primary_device_);
   if (!device) {
     LOG(ERROR) << "Could not initialize DRM device for " << path.value();
     return false;
diff --git a/ui/ozone/platform/drm/gpu/drm_thread.cc b/ui/ozone/platform/drm/gpu/drm_thread.cc
index 901dedb..5266f747 100644
--- a/ui/ozone/platform/drm/gpu/drm_thread.cc
+++ b/ui/ozone/platform/drm/gpu/drm_thread.cc
@@ -4,6 +4,8 @@
 
 #include "ui/ozone/platform/drm/gpu/drm_thread.h"
 
+#include <utility>
+
 #include "base/command_line.h"
 #include "base/thread_task_runner_handle.h"
 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
@@ -51,7 +53,7 @@ class GbmDeviceGenerator : public DrmDeviceGenerator {
                                         base::File file,
                                         bool is_primary_device) override {
     scoped_refptr<DrmDevice> drm =
-        new GbmDevice(path, file.Pass(), is_primary_device);
+        new GbmDevice(path, std::move(file), is_primary_device);
     if (drm->Initialize(use_atomic_))
       return drm;
 
@@ -128,7 +130,7 @@ void DrmThread::CreateWindow(gfx::AcceleratedWidget widget) {
   scoped_ptr<DrmWindow> window(
       new DrmWindow(widget, device_manager_.get(), screen_manager_.get()));
   window->Initialize();
-  screen_manager_->AddWindow(widget, window.Pass());
+  screen_manager_->AddWindow(widget, std::move(window));
 }
 
 void DrmThread::DestroyWindow(gfx::AcceleratedWidget widget) {
diff --git a/ui/ozone/platform/drm/gpu/drm_window_unittest.cc b/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
index a722266..9d9d0ec 100644
--- a/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ -99,7 +100,7 @@ void DrmWindowTest::SetUp() {
   window->Initialize();
   window->SetBounds(
       gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay)));
-  screen_manager_->AddWindow(kDefaultWidgetHandle, window.Pass());
+  screen_manager_->AddWindow(kDefaultWidgetHandle, std::move(window));
 }
 
 void DrmWindowTest::TearDown() {
diff --git a/ui/ozone/platform/drm/gpu/gbm_buffer.cc b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
index 34570f0..567f5d9 100644
--- a/ui/ozone/platform/drm/gpu/gbm_buffer.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
@@ -8,6 +8,7 @@
 #include <fcntl.h>
 #include <gbm.h>
 #include <xf86drm.h>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
@@ -69,7 +70,7 @@ GbmPixmap::GbmPixmap(GbmSurfaceFactory* surface_manager)
     : surface_manager_(surface_manager) {}
 
 void GbmPixmap::Initialize(base::ScopedFD dma_buf, int dma_buf_pitch) {
-  dma_buf_ = dma_buf.Pass();
+  dma_buf_ = std::move(dma_buf);
   dma_buf_pitch_ = dma_buf_pitch;
 }
 
@@ -82,7 +83,7 @@ bool GbmPixmap::InitializeFromBuffer(const scoped_refptr<GbmBuffer>& buffer) {
     PLOG(ERROR) << "Failed to export buffer to dma_buf";
     return false;
   }
-  Initialize(dma_buf.Pass(), gbm_bo_get_stride(buffer->bo()));
+  Initialize(std::move(dma_buf), gbm_bo_get_stride(buffer->bo()));
   buffer_ = buffer;
   return true;
 }
diff --git a/ui/ozone/platform/drm/gpu/gbm_device.cc b/ui/ozone/platform/drm/gpu/gbm_device.cc
index b25d827..60d63a9 100644
--- a/ui/ozone/platform/drm/gpu/gbm_device.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_device.cc
@@ -5,13 +5,14 @@
 #include "ui/ozone/platform/drm/gpu/gbm_device.h"
 
 #include <gbm.h>
+#include <utility>
 
 namespace ui {
 
 GbmDevice::GbmDevice(const base::FilePath& device_path,
                      base::File file,
                      bool is_primary_device)
-    : DrmDevice(device_path, file.Pass(), is_primary_device) {}
+    : DrmDevice(device_path, std::move(file), is_primary_device) {}
 
 GbmDevice::~GbmDevice() {
   if (device_)
diff --git a/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
index 737a066..500d74c 100644
--- a/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
@@ -4,6 +4,8 @@
 
 #include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
 
+#include <utility>
+
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h"
 #include "ui/ozone/platform/drm/gpu/drm_window_proxy.h"
@@ -14,7 +16,7 @@ namespace ui {
 
 GbmSurfaceless::GbmSurfaceless(scoped_ptr<DrmWindowProxy> window,
                                GbmSurfaceFactory* surface_manager)
-    : window_(window.Pass()), surface_manager_(surface_manager) {
+    : window_(std::move(window)), surface_manager_(surface_manager) {
   surface_manager_->RegisterSurface(window_->widget(), this);
 }
 
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_controller.cc b/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
index 09d60a9..b22aa7e 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
@@ -7,6 +7,7 @@
 #include <drm.h>
 #include <string.h>
 #include <xf86drm.h>
+#include <utility>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -34,7 +35,7 @@ HardwareDisplayController::HardwareDisplayController(
     const gfx::Point& origin)
     : origin_(origin),
       is_disabled_(controller->is_disabled()) {
-  AddCrtc(controller.Pass());
+  AddCrtc(std::move(controller));
 }
 
 HardwareDisplayController::~HardwareDisplayController() {
@@ -201,7 +202,7 @@ void HardwareDisplayController::AddCrtc(scoped_ptr<CrtcController> controller) {
       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(
@@ -235,7 +236,7 @@ scoped_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
         owned_hardware_planes_.erase(controller->drm().get());
       }
 
-      return controller.Pass();
+      return controller;
     }
   }
 
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
index 88ee51b..6a8ed5d 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
@@ -7,6 +7,7 @@
 #include <drm_fourcc.h>
 
 #include <set>
+#include <utility>
 
 #include "base/logging.h"
 #include "ui/gfx/geometry/rect.h"
@@ -108,7 +109,7 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
       // plane is updated via cursor specific DRM API. Hence, we dont keep
       // track of Cursor plane here to avoid re-using it for any other purpose.
       if (plane->type() != HardwareDisplayPlane::kCursor)
-        planes_.push_back(plane.Pass());
+        planes_.push_back(std::move(plane));
     }
   }
 
@@ -123,7 +124,7 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
             CreatePlane(resources->crtcs[i] - 1, (1 << i)));
         if (dummy_plane->Initialize(drm, std::vector<uint32_t>(), true,
                                     false)) {
-          planes_.push_back(dummy_plane.Pass());
+          planes_.push_back(std::move(dummy_plane));
         }
       }
     }
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
index 3e72e67..e29e47e 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <drm_fourcc.h>
 
+#include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ -66,7 +67,7 @@ class FakePlaneManager : public ui::HardwareDisplayPlaneManager {
       // Add support to test more formats.
       plane->Initialize(drm_, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888),
                         false, true);
-      planes_.push_back(plane.Pass());
+      planes_.push_back(std::move(plane));
     }
     // The real HDPM uses sorted planes, so sort them for consistency.
     std::sort(planes_.begin(), planes_.end(),
diff --git a/ui/ozone/platform/drm/gpu/mock_drm_device.cc b/ui/ozone/platform/drm/gpu/mock_drm_device.cc
index 8f3e751..80ba401 100644
--- a/ui/ozone/platform/drm/gpu/mock_drm_device.cc
+++ b/ui/ozone/platform/drm/gpu/mock_drm_device.cc
@@ -7,6 +7,7 @@
 #include <drm_fourcc.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
+#include <utility>
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -37,7 +38,7 @@ class MockHardwareDisplayPlaneManager
         // Add support to test more formats.
         plane->Initialize(drm, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888),
                           false, true);
-        planes_.push_back(plane.Pass());
+        planes_.push_back(std::move(plane));
       }
     }
   }
diff --git a/ui/ozone/platform/drm/gpu/screen_manager.cc b/ui/ozone/platform/drm/gpu/screen_manager.cc
index 5295984..ca58acd 100644
--- a/ui/ozone/platform/drm/gpu/screen_manager.cc
+++ b/ui/ozone/platform/drm/gpu/screen_manager.cc
@@ -5,6 +5,7 @@
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 
 #include <xf86drmMode.h>
+#include <utility>
 
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
@@ -216,7 +217,7 @@ HardwareDisplayController* ScreenManager::GetDisplayController(
 void ScreenManager::AddWindow(gfx::AcceleratedWidget widget,
                               scoped_ptr<DrmWindow> window) {
   std::pair<WidgetToWindowMap::iterator, bool> result =
-      window_map_.add(widget, window.Pass());
+      window_map_.add(widget, std::move(window));
   DCHECK(result.second) << "Window already added.";
   UpdateControllerToWindowMapping();
 }
@@ -226,7 +227,7 @@ scoped_ptr<DrmWindow> ScreenManager::RemoveWindow(
   scoped_ptr<DrmWindow> window = window_map_.take_and_erase(widget);
   DCHECK(window) << "Attempting to remove non-existing window for " << widget;
   UpdateControllerToWindowMapping();
-  return window.Pass();
+  return window;
 }
 
 DrmWindow* ScreenManager::GetWindow(gfx::AcceleratedWidget widget) {
diff --git a/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc
index 141b7e8..e50fc51 100644
--- a/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <utility>
+
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
@@ -375,7 +377,7 @@ TEST_F(ScreenManagerTest, CheckControllerToWindowMappingWithSameBounds) {
       new ui::DrmWindow(1, device_manager_.get(), screen_manager_.get()));
   window->Initialize();
   window->SetBounds(GetPrimaryBounds());
-  screen_manager_->AddWindow(1, window.Pass());
+  screen_manager_->AddWindow(1, std::move(window));
 
   screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
   screen_manager_->ConfigureDisplayController(
@@ -395,7 +397,7 @@ TEST_F(ScreenManagerTest, CheckControllerToWindowMappingWithDifferentBounds) {
   gfx::Rect new_bounds = GetPrimaryBounds();
   new_bounds.Inset(0, 0, 1, 1);
   window->SetBounds(new_bounds);
-  screen_manager_->AddWindow(1, window.Pass());
+  screen_manager_->AddWindow(1, std::move(window));
 
   screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
   screen_manager_->ConfigureDisplayController(
@@ -416,7 +418,7 @@ TEST_F(ScreenManagerTest,
         new ui::DrmWindow(i, device_manager_.get(), screen_manager_.get()));
     window->Initialize();
     window->SetBounds(GetPrimaryBounds());
-    screen_manager_->AddWindow(i, window.Pass());
+    screen_manager_->AddWindow(i, std::move(window));
   }
 
   screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
@@ -441,7 +443,7 @@ TEST_F(ScreenManagerTest, ShouldDissociateWindowOnControllerRemoval) {
       window_id, device_manager_.get(), screen_manager_.get()));
   window->Initialize();
   window->SetBounds(GetPrimaryBounds());
-  screen_manager_->AddWindow(window_id, window.Pass());
+  screen_manager_->AddWindow(window_id, std::move(window));
 
   screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
   screen_manager_->ConfigureDisplayController(
@@ -463,7 +465,7 @@ TEST_F(ScreenManagerTest, EnableControllerWhenWindowHasNoBuffer) {
       new ui::DrmWindow(1, device_manager_.get(), screen_manager_.get()));
   window->Initialize();
   window->SetBounds(GetPrimaryBounds());
-  screen_manager_->AddWindow(1, window.Pass());
+  screen_manager_->AddWindow(1, std::move(window));
 
   screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
   screen_manager_->ConfigureDisplayController(
@@ -497,7 +499,7 @@ TEST_F(ScreenManagerTest, EnableControllerWhenWindowHasBuffer) {
   window->SchedulePageFlip(
       std::vector<ui::OverlayPlane>(1, ui::OverlayPlane(buffer)),
       base::Bind(&EmptySwapCallback));
-  screen_manager_->AddWindow(1, window.Pass());
+  screen_manager_->AddWindow(1, std::move(window));
 
   screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
   screen_manager_->ConfigureDisplayController(
diff --git a/ui/ozone/platform/drm/host/drm_device_handle.cc b/ui/ozone/platform/drm/host/drm_device_handle.cc
index 8d9fc0c..083c292 100644
--- a/ui/ozone/platform/drm/host/drm_device_handle.cc
+++ b/ui/ozone/platform/drm/host/drm_device_handle.cc
@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
+#include <utility>
 
 #include "base/files/file_path.h"
 #include "base/posix/eintr_wrapper.h"
@@ -65,7 +66,7 @@ bool DrmDeviceHandle::IsValid() const {
 }
 
 base::ScopedFD DrmDeviceHandle::PassFD() {
-  return file_.Pass();
+  return std::move(file_);
 }
 
 }  // namespace ui
diff --git a/ui/ozone/platform/drm/host/drm_display_host_manager.cc b/ui/ozone/platform/drm/host/drm_display_host_manager.cc
index f0b86c1..faa9ef0 100644
--- a/ui/ozone/platform/drm/host/drm_display_host_manager.cc
+++ b/ui/ozone/platform/drm/host/drm_display_host_manager.cc
@@ -6,6 +6,7 @@
 
 #include <fcntl.h>
 #include <xf86drm.h>
+#include <utility>
 
 #include "base/files/file_enumerator.h"
 #include "base/thread_task_runner_handle.h"
@@ -46,7 +47,7 @@ void OpenDeviceOnWorkerThread(
   scoped_ptr<DrmDeviceHandle> handle(new DrmDeviceHandle());
   handle->Initialize(path);
   reply_runner->PostTask(
-      FROM_HERE, base::Bind(callback, path, base::Passed(handle.Pass())));
+      FROM_HERE, base::Bind(callback, path, base::Passed(std::move(handle))));
 }
 
 base::FilePath GetPrimaryDisplayCardPath() {
@@ -328,7 +329,7 @@ void DrmDisplayHostManager::OnChannelEstablished(
 
   drm_devices_.clear();
   drm_devices_.insert(primary_graphics_card_path_);
-  scoped_ptr<DrmDeviceHandle> handle = primary_drm_device_handle_.Pass();
+  scoped_ptr<DrmDeviceHandle> handle = std::move(primary_drm_device_handle_);
   if (!handle) {
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     handle.reset(new DrmDeviceHandle());
diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
index d8ee6a2..3f1dc5e 100644
--- a/ui/ozone/platform/drm/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
@@ -9,6 +9,7 @@
 #include <gbm.h>
 #include <stdlib.h>
 #include <xf86drm.h>
+#include <utility>
 
 #include "base/bind.h"
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
@@ -105,7 +106,7 @@ class OzonePlatformGbm : public OzonePlatform {
                           event_factory_ozone_.get(), cursor_.get(),
                           window_manager_.get(), display_manager_.get()));
     platform_window->Initialize();
-    return platform_window.Pass();
+    return std::move(platform_window);
   }
   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
     return make_scoped_ptr(