cc: Merge LayerTree into the LayerTreeHost.

cc/layers/layer_list_iterator_unittest.cc

 // Copyright 2016 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/layers/layer_list_iterator.h"
 
 #include <memory>
 
 #include "base/containers/adapters.h"
 #include "cc/animation/animation_host.h"
@@ skipping 50 matching lines @@
 
   layer5->AddChild(std::move(layer6));
   layer5->AddChild(std::move(layer7));
 
   layer1->AddChild(std::move(layer2));
   layer1->AddChild(std::move(layer5));
 
   host->SetRootLayer(std::move(layer1));
 
   int i = 1;
-  for (auto* layer : *host->GetLayerTree()) {
+  for (auto* layer : *host) {
     EXPECT_EQ(i++, layer_id_to_order[layer->id()]);
   }
   EXPECT_EQ(8, i);
 }
 
 TEST(LayerListIteratorTest, VerifySingleLayer) {
   // Unfortunate preamble.
   FakeLayerTreeHostClient client;
   TestTaskGraphRunner task_graph_runner;
   auto animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
   std::unique_ptr<FakeLayerTreeHost> host_ptr = FakeLayerTreeHost::Create(
       &client, &task_graph_runner, animation_host.get());
   FakeLayerTreeHost* host = host_ptr.get();
 
   // This test constructs a tree consisting of a single layer.
   scoped_refptr<Layer> layer1 = Layer::Create();
   std::unordered_map<int, int> layer_id_to_order;
   layer_id_to_order[layer1->id()] = 1;
   host->SetRootLayer(std::move(layer1));
 
   int i = 1;
-  for (auto* layer : *host->GetLayerTree()) {
+  for (auto* layer : *host) {
     EXPECT_EQ(i++, layer_id_to_order[layer->id()]);
   }
   EXPECT_EQ(2, i);
 }
 
 TEST(LayerListIteratorTest, VerifyNullFirstLayer) {
   // Ensures that if an iterator is constructed with a nullptr, that it can be
   // iterated without issue and that it remains equal to any other
   // null-initialized iterator.
   LayerListIterator<Layer> it(nullptr);
@@ skipping 45 matching lines @@
   layer5->AddChild(std::move(layer6));
   layer5->AddChild(std::move(layer7));
 
   layer1->AddChild(std::move(layer2));
   layer1->AddChild(std::move(layer5));
 
   host->SetRootLayer(std::move(layer1));
 
   int i = 7;
 
-  for (auto* layer : base::Reversed(*host->GetLayerTree())) {
+  for (auto* layer : base::Reversed(*host)) {
     EXPECT_EQ(i--, layer_id_to_order[layer->id()]);
   }
 
   EXPECT_EQ(0, i);
 }
 
 TEST(LayerListReverseIteratorTest, VerifySingleLayer) {
   // Unfortunate preamble.
   FakeLayerTreeHostClient client;
   TestTaskGraphRunner task_graph_runner;
   auto animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
   std::unique_ptr<FakeLayerTreeHost> host_ptr = FakeLayerTreeHost::Create(
       &client, &task_graph_runner, animation_host.get());
   FakeLayerTreeHost* host = host_ptr.get();
 
   // This test constructs a tree consisting of a single layer.
   scoped_refptr<Layer> layer1 = Layer::Create();
   std::unordered_map<int, int> layer_id_to_order;
   layer_id_to_order[layer1->id()] = 1;
   host->SetRootLayer(std::move(layer1));
 
   int i = 1;
-  for (auto* layer : base::Reversed(*host->GetLayerTree())) {
+  for (auto* layer : base::Reversed(*host)) {
     EXPECT_EQ(i--, layer_id_to_order[layer->id()]);
   }
   EXPECT_EQ(0, i);
 }
 
 TEST(LayerListReverseIteratorTest, VerifyNullFirstLayer) {
   // Ensures that if an iterator is constructed with a nullptr, that it can be
   // iterated without issue and that it remains equal to any other
   // null-initialized iterator.
   LayerListReverseIterator<Layer> it(nullptr);
@@ skipping 179 matching lines @@
   LayerListReverseIterator<LayerImpl> it(nullptr);
   LayerListReverseIterator<LayerImpl> end(nullptr);
 
   EXPECT_EQ(it, end);
   ++it;
   EXPECT_EQ(it, end);
 }
 
 }  // namespace
 }  // namespace cc