Global conversion of Pass()→std::move() on OS=linux (GYP edition)

components/exo/buffer.cc

 // Copyright 2015 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 "components/exo/buffer.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <stdint.h>
-
 #include <algorithm>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/output/context_provider.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/resources/texture_mailbox.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ui/aura/env.h"
@@ skipping 124 matching lines @@
   gles2->ActiveTexture(GL_TEXTURE0);
   gles2->BindTexture(texture_target_, texture_id_);
   gles2->ReleaseTexImage2DCHROMIUM(texture_target_, image_id_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Buffer, public:
 
 Buffer::Buffer(scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer,
                unsigned texture_target)
-    : gpu_memory_buffer_(gpu_memory_buffer.Pass()),
+    : gpu_memory_buffer_(std::move(gpu_memory_buffer)),
       texture_target_(texture_target),
       use_count_(0) {}
 
 Buffer::~Buffer() {}
 
 scoped_ptr<cc::SingleReleaseCallback> Buffer::ProduceTextureMailbox(
     cc::TextureMailbox* texture_mailbox) {
   DLOG_IF(WARNING, use_count_)
       << "Producing a texture mailbox for a buffer that has not been released";
 
   // Increment the use count for this buffer.
   ++use_count_;
 
   // Creating a new texture is relatively expensive so we reuse the last
   // texture whenever possible.
-  scoped_ptr<Texture> texture = last_texture_.Pass();
+  scoped_ptr<Texture> texture = std::move(last_texture_);
 
   // If texture is lost, destroy it to ensure that we create a new one below.
   if (texture && texture->IsLost())
     texture.reset();
 
   // Create a new texture if one doesn't already exist. The contents of this
   // buffer can be bound to the texture using a call to BindTexImage and must
   // be released using a matching ReleaseTexImage call before it can be reused
   // or destroyed.
   if (!texture) {
@@ skipping 60 matching lines @@
   // Release image so it can safely be reused or destroyed.
   texture->ReleaseTexImage(sync_token);
 
   // Early out if buffer is gone. This can happen when the client destroyed the
   // buffer before receiving a release callback.
   if (!buffer)
     return;
 
   // Allow buffer to reused texture if it's not lost.
   if (!is_lost)
-    buffer->last_texture_ = texture.Pass();
+    buffer->last_texture_ = std::move(texture);
 
   buffer->Release();
 }
 
 }  // namespace exo