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

components/exo/surface.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/surface.h"
 
+#include <utility>
+
 #include "base/callback_helpers.h"
 #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/resources/single_release_callback.h"
 #include "components/exo/buffer.h"
 #include "components/exo/surface_delegate.h"
 #include "components/exo/surface_observer.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 245 matching lines @@
     cc::TextureMailbox texture_mailbox;
     scoped_ptr<cc::SingleReleaseCallback> texture_mailbox_release_callback;
     if (current_buffer_) {
       texture_mailbox_release_callback =
           current_buffer_->ProduceTextureMailbox(&texture_mailbox);
     }
 
     if (texture_mailbox_release_callback) {
       // Update layer with the new contents.
       layer()->SetTextureMailbox(texture_mailbox,
-                                 texture_mailbox_release_callback.Pass(),
+                                 std::move(texture_mailbox_release_callback),
                                  texture_mailbox.size_in_pixels());
       layer()->SetTextureFlipped(false);
       layer()->SetBounds(gfx::Rect(layer()->bounds().origin(),
                                    texture_mailbox.size_in_pixels()));
       layer()->SetFillsBoundsOpaquely(pending_opaque_region_.contains(
           gfx::RectToSkIRect(gfx::Rect(texture_mailbox.size_in_pixels()))));
     } else {
       // Show solid color content if no buffer is attached or we failed
       // to produce a texture mailbox for the currently attached buffer.
       layer()->SetShowSolidColorContent();
@@ skipping 112 matching lines @@
   // Early out if no contents is currently assigned to the surface.
   if (!current_buffer_)
     return;
 
   // Update contents by producing a new texture mailbox for the current buffer.
   cc::TextureMailbox texture_mailbox;
   scoped_ptr<cc::SingleReleaseCallback> texture_mailbox_release_callback =
       current_buffer_->ProduceTextureMailbox(&texture_mailbox);
   if (texture_mailbox_release_callback) {
     layer()->SetTextureMailbox(texture_mailbox,
-                               texture_mailbox_release_callback.Pass(),
+                               std::move(texture_mailbox_release_callback),
                                texture_mailbox.size_in_pixels());
     layer()->SetTextureFlipped(false);
     layer()->SchedulePaint(gfx::Rect(texture_mailbox.size_in_pixels()));
   }
 }
 
 void Surface::OnCompositingAborted(ui::Compositor* compositor) {
   // The contents of this surface might be lost if compositing aborted because
   // of a lost graphics context. We recover from this by updating the contents
   // of the surface next time the compositor successfully ends compositing.
   update_contents_after_successful_compositing_ = true;
 }
 
 void Surface::OnCompositingShuttingDown(ui::Compositor* compositor) {
   compositor->RemoveObserver(this);
   compositor_ = nullptr;
 }
 
 }  // namespace exo