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

BUG=557422
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

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

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

11 files changed, 50 insertions, 32 deletions

diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc
index 6ec8a34..7f0f033 100644
--- a/cc/animation/layer_animation_controller_unittest.cc
+++ b/cc/animation/layer_animation_controller_unittest.cc
@@ -1655,9 +1655,8 @@ TEST(LayerAnimationControllerTest, InactiveObserverGetsTicked) {
 
   const int id = 1;
   controller->AddAnimation(CreateAnimation(
-      scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.5f, 1.f))
-          .Pass(),
-      id, Animation::OPACITY));
+      scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.5f, 1.f)), id,
+      Animation::OPACITY));
 
   // Without an observer, the animation shouldn't progress to the STARTING
   // state.
diff --git a/cc/input/scroll_state.cc b/cc/input/scroll_state.cc
index 513c08f..a5ea07f 100644
--- a/cc/input/scroll_state.cc
+++ b/cc/input/scroll_state.cc
@@ -4,6 +4,8 @@
 
 #include "cc/input/scroll_state.h"
 
+#include <utility>
+
 #include "cc/layers/layer_impl.h"
 
 namespace cc {
@@ -24,7 +26,7 @@ ScrollState::ScrollState(double delta_x,
                                 is_direct_manipulation)) {}
 
 ScrollState::ScrollState(scoped_ptr<ScrollStateData> data) {
-  data_ = data.Pass();
+  data_ = std::move(data);
 }
 
 ScrollState::~ScrollState() {}
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 6892f39..432992b 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/layer_impl.h"
 
+#include <utility>
+
 #include "base/json/json_reader.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/stringprintf.h"
@@ -142,7 +144,7 @@ scoped_ptr<LayerImpl> LayerImpl::RemoveChild(LayerImpl* child) {
        it != children_.end();
        ++it) {
     if (it->get() == child) {
-      scoped_ptr<LayerImpl> ret = it->Pass();
+      scoped_ptr<LayerImpl> ret = std::move(*it);
       children_.erase(it);
       layer_tree_impl()->set_needs_update_draw_properties();
       return ret;
diff --git a/cc/layers/painted_scrollbar_layer_unittest.cc b/cc/layers/painted_scrollbar_layer_unittest.cc
index ac814ee..d170e8e 100644
--- a/cc/layers/painted_scrollbar_layer_unittest.cc
+++ b/cc/layers/painted_scrollbar_layer_unittest.cc
@@ -42,7 +42,7 @@ TEST(PaintedScrollbarLayerTest, NeedsPaint) {
   MockScrollbar* scrollbar = new MockScrollbar();
   scoped_refptr<PaintedScrollbarLayer> scrollbar_layer =
       PaintedScrollbarLayer::Create(layer_settings_,
-                                    scoped_ptr<Scrollbar>(scrollbar).Pass(), 1);
+                                    scoped_ptr<Scrollbar>(scrollbar), 1);
 
   scrollbar_layer->SetIsDrawable(true);
   scrollbar_layer->SetBounds(gfx::Size(100, 100));
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
index 7974297..e525025 100644
--- a/cc/output/overlay_unittest.cc
+++ b/cc/output/overlay_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 "cc/base/region.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/gl_renderer.h"
@@ -694,7 +696,7 @@ TEST_F(SandwichTest, DamageRectNonEmpty) {
   damage_rect_ = kOverlayRect;
 
   RenderPassList pass_list;
-  pass_list.push_back(pass.Pass());
+  pass_list.push_back(std::move(pass));
 
   // Check for potential candidates.
   OverlayCandidateList candidate_list;
@@ -1396,7 +1398,7 @@ TEST_F(UnderlayTest, DamageSubtractedForConsecutiveIdenticalUnderlays) {
                                pass->shared_quad_state_list.back(), pass.get());
 
     RenderPassList pass_list;
-    pass_list.push_back(pass.Pass());
+    pass_list.push_back(std::move(pass));
     OverlayCandidateList candidate_list;
     overlay_processor_->ProcessForOverlays(resource_provider_.get(), &pass_list,
                                            &candidate_list, nullptr,
@@ -1422,7 +1424,7 @@ TEST_F(UnderlayTest, DamageNotSubtractedForNonIdenticalConsecutiveUnderlays) {
     damage_rect_ = overlay_rects[i];
 
     RenderPassList pass_list;
-    pass_list.push_back(pass.Pass());
+    pass_list.push_back(std::move(pass));
     OverlayCandidateList candidate_list;
     overlay_processor_->ProcessForOverlays(resource_provider_.get(), &pass_list,
                                            &candidate_list, nullptr,
@@ -1445,7 +1447,7 @@ TEST_F(UnderlayTest, DamageNotSubtractedWhenQuadsAboveOverlap) {
     damage_rect_ = kOverlayRect;
 
     RenderPassList pass_list;
-    pass_list.push_back(pass.Pass());
+    pass_list.push_back(std::move(pass));
     OverlayCandidateList candidate_list;
     overlay_processor_->ProcessForOverlays(resource_provider_.get(), &pass_list,
                                            &candidate_list, nullptr,
@@ -1469,7 +1471,7 @@ TEST_F(UnderlayTest, DamageSubtractedWhenQuadsAboveDontOverlap) {
     damage_rect_ = kOverlayBottomRightRect;
 
     RenderPassList pass_list;
-    pass_list.push_back(pass.Pass());
+    pass_list.push_back(std::move(pass));
     OverlayCandidateList candidate_list;
     overlay_processor_->ProcessForOverlays(resource_provider_.get(), &pass_list,
                                            &candidate_list, nullptr,
@@ -2029,7 +2031,7 @@ TEST_F(GLRendererWithOverlaysTest, ResourcesExportedAndReturnedWithExtraDelay) {
 
   scoped_ptr<RenderPass> pass = CreateRenderPass();
   RenderPassList pass_list;
-  pass_list.push_back(pass.Pass());
+  pass_list.push_back(std::move(pass));
 
   DirectRenderer::DrawingFrame frame1;
   frame1.render_passes_in_draw_order = &pass_list;
diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
index c7b07b7..b6e432a 100644
--- a/cc/raster/one_copy_tile_task_worker_pool.cc
+++ b/cc/raster/one_copy_tile_task_worker_pool.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <limits>
+#include <utility>
 
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
@@ -606,7 +607,7 @@ OneCopyTileTaskWorkerPool::AcquireStagingBuffer(const Resource* resource,
           return buffer->content_id == previous_content_id;
         });
     if (it != free_buffers_.end()) {
-      staging_buffer = it->Pass();
+      staging_buffer = std::move(*it);
       free_buffers_.erase(it);
       MarkStagingBufferAsBusy(staging_buffer.get());
     }
@@ -621,7 +622,7 @@ OneCopyTileTaskWorkerPool::AcquireStagingBuffer(const Resource* resource,
                               buffer->format == resource->format();
                      });
     if (it != free_buffers_.end()) {
-      staging_buffer = it->Pass();
+      staging_buffer = std::move(*it);
       free_buffers_.erase(it);
       MarkStagingBufferAsBusy(staging_buffer.get());
     }
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc
index 778ddbe..507aa2b 100644
--- a/cc/resources/resource_pool.cc
+++ b/cc/resources/resource_pool.cc
@@ -5,6 +5,7 @@
 #include "cc/resources/resource_pool.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
@@ -222,11 +223,11 @@ void ResourcePool::CheckBusyResources() {
     PoolResource* resource = it->get();
 
     if (resource_provider_->CanLockForWrite(resource->id())) {
-      DidFinishUsingResource(it->Pass());
+      DidFinishUsingResource(std::move(*it));
       busy_resources_.erase(it);
     } else if (resource_provider_->IsLost(resource->id())) {
       // Remove lost resources from pool.
-      DeleteResource(it->Pass());
+      DeleteResource(std::move(*it));
       busy_resources_.erase(it);
     } else {
       ++i;
diff --git a/cc/surfaces/display_unittest.cc b/cc/surfaces/display_unittest.cc
index c699349..9c90ce0 100644
--- a/cc/surfaces/display_unittest.cc
+++ b/cc/surfaces/display_unittest.cc
@@ -2,13 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "cc/surfaces/display.h"
+
+#include <utility>
+
 #include "base/test/null_task_runner.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/shared_bitmap_manager.h"
-#include "cc/surfaces/display.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
@@ -403,7 +406,7 @@ TEST_F(DisplayTest, DisplayDamaged) {
     pass->damage_rect = gfx::Rect(0, 0, 99, 99);
     pass->id = RenderPassId(1, 1);
 
-    pass_list.push_back(pass.Pass());
+    pass_list.push_back(std::move(pass));
     scheduler.ResetDamageForTest();
     SubmitCompositorFrame(&pass_list, surface_id);
     EXPECT_TRUE(scheduler.damaged);
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc
index f89ae3b..a0ac9f0 100644
--- a/cc/surfaces/surface_aggregator_unittest.cc
+++ b/cc/surfaces/surface_aggregator_unittest.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "cc/surfaces/surface_aggregator.h"
+
+#include <utility>
+
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
@@ -11,7 +15,6 @@
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface.h"
-#include "cc/surfaces/surface_aggregator.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id_allocator.h"
@@ -505,7 +508,7 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, UnreferencedSurface) {
   scoped_ptr<CopyOutputRequest> copy_request(
       CopyOutputRequest::CreateEmptyRequest());
   CopyOutputRequest* copy_request_ptr = copy_request.get();
-  factory_.RequestCopyOfSurface(embedded_surface_id, copy_request.Pass());
+  factory_.RequestCopyOfSurface(embedded_surface_id, std::move(copy_request));
 
   SurfaceId parent_surface_id = allocator_.GenerateId();
   factory_.Create(parent_surface_id);
@@ -524,10 +527,10 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, UnreferencedSurface) {
               parent_passes, arraysize(parent_passes));
 
     scoped_ptr<CompositorFrame> frame(new CompositorFrame);
-    frame->delegated_frame_data = frame_data.Pass();
+    frame->delegated_frame_data = std::move(frame_data);
     frame->metadata.referenced_surfaces.push_back(embedded_surface_id);
 
-    factory_.SubmitCompositorFrame(parent_surface_id, frame.Pass(),
+    factory_.SubmitCompositorFrame(parent_surface_id, std::move(frame),
                                    SurfaceFactory::DrawCallback());
   }
 
@@ -541,13 +544,13 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, UnreferencedSurface) {
               root_passes, arraysize(root_passes));
 
     scoped_ptr<CompositorFrame> frame(new CompositorFrame);
-    frame->delegated_frame_data = frame_data.Pass();
+    frame->delegated_frame_data = std::move(frame_data);
     frame->metadata.referenced_surfaces.push_back(parent_surface_id);
     // Reference to Surface ID of a Surface that doesn't exist should be
     // included in previous_contained_surfaces, but otherwise ignored.
     frame->metadata.referenced_surfaces.push_back(nonexistent_surface_id);
 
-    factory_.SubmitCompositorFrame(root_surface_id_, frame.Pass(),
+    factory_.SubmitCompositorFrame(root_surface_id_, std::move(frame),
                                    SurfaceFactory::DrawCallback());
   }
 
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc
index b022327..cf242c3 100644
--- a/cc/surfaces/surface_factory_unittest.cc
+++ b/cc/surfaces/surface_factory_unittest.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "cc/surfaces/surface_factory.h"
+
+#include <utility>
+
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
@@ -9,7 +13,6 @@
 #include "cc/output/delegated_frame_data.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/surfaces/surface.h"
-#include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/scheduler_test_common.h"
@@ -540,11 +543,11 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
   {
     scoped_ptr<RenderPass> render_pass(RenderPass::Create());
     scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
-    frame_data->render_pass_list.push_back(render_pass.Pass());
+    frame_data->render_pass_list.push_back(std::move(render_pass));
     scoped_ptr<CompositorFrame> frame(new CompositorFrame);
     frame->metadata.referenced_surfaces.push_back(surface_id_);
-    frame->delegated_frame_data = frame_data.Pass();
-    factory_->SubmitCompositorFrame(surface_id_, frame.Pass(),
+    frame->delegated_frame_data = std::move(frame_data);
+    factory_->SubmitCompositorFrame(surface_id_, std::move(frame),
                                     SurfaceFactory::DrawCallback());
   }
   void* source1 = &source1;
@@ -556,7 +559,7 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
       base::Bind(&CopyRequestTestCallback, &called1));
   request->set_source(source1);
 
-  factory_->RequestCopyOfSurface(surface_id_, request.Pass());
+  factory_->RequestCopyOfSurface(surface_id_, std::move(request));
   EXPECT_FALSE(called1);
 
   bool called2 = false;
@@ -564,7 +567,7 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
       base::Bind(&CopyRequestTestCallback, &called2));
   request->set_source(source2);
 
-  factory_->RequestCopyOfSurface(surface_id_, request.Pass());
+  factory_->RequestCopyOfSurface(surface_id_, std::move(request));
   // Callbacks have different sources so neither should be called.
   EXPECT_FALSE(called1);
   EXPECT_FALSE(called2);
@@ -574,7 +577,7 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
       base::Bind(&CopyRequestTestCallback, &called3));
   request->set_source(source1);
 
-  factory_->RequestCopyOfSurface(surface_id_, request.Pass());
+  factory_->RequestCopyOfSurface(surface_id_, std::move(request));
   // Two callbacks are from source1, so the first should be called.
   EXPECT_TRUE(called1);
   EXPECT_FALSE(called2);
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
index 4301a30..a025629 100644
--- a/cc/test/layer_test_common.h
+++ b/cc/test/layer_test_common.h
@@ -5,6 +5,8 @@
 #ifndef CC_TEST_LAYER_TEST_COMMON_H_
 #define CC_TEST_LAYER_TEST_COMMON_H_
 
+#include <utility>
+
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/quads/render_pass.h"
@@ -75,7 +77,7 @@ class LayerTestCommon {
       scoped_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
       T* ptr = layer.get();
-      origin->SetReplicaLayer(layer.Pass());
+      origin->SetReplicaLayer(std::move(layer));
       return ptr;
     }