cc: Replace Pass() with std::move() in some subdirs.

cc/trees/tree_synchronizer_unittest.cc

 // Copyright 2011 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 "cc/trees/tree_synchronizer.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 249 matching lines @@
 
   // Add a new layer to the Layer side
   layer_tree_root->children()[0]->AddChild(
       MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
   // Remove one.
   layer_tree_root->children()[1]->RemoveFromParent();
   int second_layer_impl_id = layer_impl_tree_root->children()[1]->id();
 
   // Synchronize again. After the sync the trees should be equivalent and we
   // should have created and destroyed one LayerImpl.
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   ASSERT_EQ(1u, layer_impl_destruction_list.size());
   EXPECT_EQ(second_layer_impl_id, layer_impl_destruction_list[0]);
 }
 
 // Constructs a very simple tree and checks that a stacking-order change is
 // tracked properly.
@@ skipping 21 matching lines @@
 
   // We have to push properties to pick up the destruction list pointer.
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
 
   layer_impl_tree_root->ResetAllChangeTrackingForSubtree();
 
   // re-insert the layer and sync again.
   child2->RemoveFromParent();
   layer_tree_root->AddChild(child2);
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
 
   // Check that the impl thread properly tracked the change.
   EXPECT_FALSE(layer_impl_tree_root->LayerPropertyChanged());
   EXPECT_FALSE(layer_impl_tree_root->children()[0]->LayerPropertyChanged());
@@ skipping 93 matching lines @@
   layer_tree_root->AddChild(layer_d);
   layer_a->RemoveAllChildren();
   layer_d->AddChild(layer_a);
   layer_c->RemoveAllChildren();
   layer_d->AddChild(layer_c);
   layer_b->RemoveAllChildren();
   layer_c->AddChild(layer_b);
 
   // After another synchronize our trees should match and we should not have
   // destroyed any LayerImpls
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   EXPECT_EQ(0u, layer_impl_destruction_list.size());
 }
 
 // Constructs a very simple tree, synchronizes it, then synchronizes to a
 // totally new tree. All layers from the old tree should be deleted.
 TEST_F(TreeSynchronizerTest, SyncSimpleTreeThenDestroy) {
@@ skipping 23 matching lines @@
   TreeSynchronizer::PushProperties(old_layer_tree_root.get(),
                                    layer_impl_tree_root.get());
 
   // Remove all children on the Layer side.
   old_layer_tree_root->RemoveAllChildren();
 
   // Synchronize again. After the sync all LayerImpls from the old tree should
   // be deleted.
   scoped_refptr<Layer> new_layer_tree_root = Layer::Create(layer_settings_);
   host_->SetRootLayer(new_layer_tree_root);
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(new_layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      new_layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_->active_tree());
   ExpectTreesAreIdentical(new_layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   ASSERT_EQ(3u, layer_impl_destruction_list.size());
 
   EXPECT_TRUE(std::find(layer_impl_destruction_list.begin(),
                         layer_impl_destruction_list.end(),
                         old_tree_root_layer_id) !=
               layer_impl_destruction_list.end());
@@ skipping 34 matching lines @@
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_->active_tree());
 
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   // Remove the mask layer.
   layer_tree_root->children()[0]->SetMaskLayer(NULL);
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   // Remove the replica layer.
   layer_tree_root->children()[1]->SetReplicaLayer(NULL);
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   // Remove the replica mask.
   replica_layer_with_mask->SetMaskLayer(NULL);
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 }
 
 TEST_F(TreeSynchronizerTest, SynchronizeAnimations) {
   LayerTreeSettings settings;
   FakeImplTaskRunnerProvider task_runner_provider;
   FakeRenderingStatsInstrumentation stats_instrumentation;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
   scoped_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
       settings, nullptr, &task_runner_provider, &stats_instrumentation,
       &shared_bitmap_manager, nullptr, &task_graph_runner, 0);
 
   scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
   host_->SetRootLayer(layer_tree_root);
 
   layer_tree_root->SetLayerAnimationControllerForTest(
       FakeLayerAnimationController::Create());
 
   EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(
       layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_->active_tree());
 
   EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(
       layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
 }
 
 TEST_F(TreeSynchronizerTest, SynchronizeScrollParent) {
   LayerTreeSettings settings;
   FakeImplTaskRunnerProvider task_runner_provider;
   FakeRenderingStatsInstrumentation stats_instrumentation;
   TestSharedBitmapManager shared_bitmap_manager;
@@ skipping 21 matching lines @@
                                    layer_impl_tree_root.get());
   {
     SCOPED_TRACE("case one");
     ExpectTreesAreIdentical(layer_tree_root.get(),
                             layer_impl_tree_root.get(),
                             host_impl->active_tree());
   }
 
   // Remove the first scroll child.
   layer_tree_root->children()[1]->RemoveFromParent();
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_impl->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   {
     SCOPED_TRACE("case two");
     ExpectTreesAreIdentical(layer_tree_root.get(),
                             layer_impl_tree_root.get(),
                             host_impl->active_tree());
   }
 
   // Add an additional scroll layer.
   scoped_refptr<Layer> additional_scroll_child = Layer::Create(layer_settings_);
   layer_tree_root->AddChild(additional_scroll_child);
   additional_scroll_child->SetScrollParent(scroll_parent.get());
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_impl->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   {
     SCOPED_TRACE("case three");
     ExpectTreesAreIdentical(layer_tree_root.get(),
                             layer_impl_tree_root.get(),
                             host_impl->active_tree());
   }
 }
 
@@ skipping 29 matching lines @@
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl->active_tree());
 
   // Remove the first clip child.
   clip_child1->RemoveFromParent();
   clip_child1 = NULL;
 
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_impl->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl->active_tree());
 
   // Add an additional clip child.
   scoped_refptr<Layer> additional_clip_child = Layer::Create(layer_settings_);
   intervening->AddChild(additional_clip_child);
   additional_clip_child->SetClipParent(clip_parent.get());
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_impl->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl->active_tree());
 
   // Remove the nearest clipping ancestor.
   clip_parent->RemoveFromParent();
   clip_parent = NULL;
-  layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                         layer_impl_tree_root.Pass(),
-                                         host_impl->active_tree());
+  layer_impl_tree_root = TreeSynchronizer::SynchronizeTrees(
+      layer_tree_root.get(), std::move(layer_impl_tree_root),
+      host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl->active_tree());
 
   // The clip children should have been unhooked.
   EXPECT_EQ(2u, intervening->children().size());
   EXPECT_FALSE(clip_child2->clip_parent());
   EXPECT_FALSE(additional_clip_child->clip_parent());
 }
 
 }  // namespace
 }  // namespace cc