cc: Consolidate LayerList types.

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 <vector>
 
 #include "cc/animation/layer_animation_controller.h"
@@ skipping 101 matching lines @@
     ExpectTreesAreIdentical(
         layer->mask_layer(), layer_impl->mask_layer(), tree_impl);
   }
 
   ASSERT_EQ(!!layer->replica_layer(), !!layer_impl->replica_layer());
   if (layer->replica_layer()) {
     ExpectTreesAreIdentical(
         layer->replica_layer(), layer_impl->replica_layer(), tree_impl);
   }
 
-  const std::vector<scoped_refptr<Layer> >& layer_children = layer->children();
-  const ScopedPtrVector<LayerImpl>& layer_impl_children =
-      layer_impl->children();
+  const LayerList& layer_children = layer->children();
+  const OwnedLayerImplList& layer_impl_children = layer_impl->children();
 
   ASSERT_EQ(layer_children.size(), layer_impl_children.size());
 
   for (size_t i = 0; i < layer_children.size(); ++i) {
     ExpectTreesAreIdentical(
         layer_children[i].get(), layer_impl_children[i], tree_impl);
   }
 }
 
 class TreeSynchronizerTest : public testing::Test {
@@ skipping 375 matching lines @@
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_impl_.active_tree());
 
   EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(
       layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
 }
 
 }  // namespace
 }  // namespace cc