Revert of cc: Move data to LayerTree from LayerTreeHost.

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

 // 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 "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_output_surface.h"
@@ skipping 397 matching lines @@
 
         cc::LayerTreeSettings settings = WebLayerTreeViewImplForTesting::defaultLayerTreeSettings();
         settings.single_thread_proxy_scheduler = false;
         settings.use_layer_lists = true;
         m_webLayerTreeView = wrapUnique(new WebLayerTreeViewWithOutputSurface(settings));
         m_webLayerTreeView->setRootLayer(*getPaintArtifactCompositor().getWebLayer());
     }
 
     const cc::PropertyTrees& propertyTrees()
     {
-        return *m_webLayerTreeView->layerTreeHost()->GetLayerTree()->property_trees();
+        return *m_webLayerTreeView->layerTreeHost()->property_trees();
     }
 
     const cc::TransformNode& transformNode(const cc::Layer* layer)
     {
         return *propertyTrees().transform_tree.Node(layer->transform_tree_index());
     }
 
     void update(const PaintArtifact& artifact)
     {
         PaintArtifactCompositorTest::update(artifact);
@@ skipping 421 matching lines @@
     EXPECT_EQ(convertedDummyRootEffect.id, convertedEffect3.parent_id);
     EXPECT_FLOAT_EQ(0.2, convertedEffect3.opacity);
 
     EXPECT_EQ(convertedEffect2.id, contentLayerAt(0)->effect_tree_index());
     EXPECT_EQ(convertedEffect1.id, contentLayerAt(1)->effect_tree_index());
     EXPECT_EQ(convertedEffect3.id, contentLayerAt(2)->effect_tree_index());
 }
 
 } // namespace
 } // namespace blink