[cc] Make LayerImpls point at LayerTreeImpl instead of LTHI

cc/layer_sorter_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/layer_sorter.h"
 
 #include "cc/layer_impl.h"
 #include "cc/math_util.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/fake_impl_proxy.h"
@@ skipping 184 matching lines @@
 
     // Input list of layers: [1, 2, 3, 4, 5].
     // Expected output: [3, 4, 1, 2, 5].
     //    - 1, 2, and 5 do not have a 3d z difference, and therefore their relative ordering should be retained.
     //    - 3 and 4 do not have a 3d z difference, and therefore their relative ordering should be retained.
     //    - 3 and 4 should be re-sorted so they are in front of 1, 2, and 5.
 
     FakeImplProxy proxy;
     FakeLayerTreeHostImpl hostImpl(&proxy);
 
-    scoped_ptr<LayerImpl> layer1 = LayerImpl::create(&hostImpl, 1);
-    scoped_ptr<LayerImpl> layer2 = LayerImpl::create(&hostImpl, 2);
-    scoped_ptr<LayerImpl> layer3 = LayerImpl::create(&hostImpl, 3);
-    scoped_ptr<LayerImpl> layer4 = LayerImpl::create(&hostImpl, 4);
-    scoped_ptr<LayerImpl> layer5 = LayerImpl::create(&hostImpl, 5);
+    scoped_ptr<LayerImpl> layer1 = LayerImpl::create(hostImpl.activeTree(), 1);
+    scoped_ptr<LayerImpl> layer2 = LayerImpl::create(hostImpl.activeTree(), 2);
+    scoped_ptr<LayerImpl> layer3 = LayerImpl::create(hostImpl.activeTree(), 3);
+    scoped_ptr<LayerImpl> layer4 = LayerImpl::create(hostImpl.activeTree(), 4);
+    scoped_ptr<LayerImpl> layer5 = LayerImpl::create(hostImpl.activeTree(), 5);
 
     gfx::Transform BehindMatrix;
     BehindMatrix.Translate3d(0, 0, 2);
     gfx::Transform FrontMatrix;
     FrontMatrix.Translate3d(0, 0, 1);
 
     layer1->setBounds(gfx::Size(10, 10));
     layer1->setContentBounds(gfx::Size(10, 10));
     layer1->drawProperties().target_space_transform = BehindMatrix;
     layer1->setDrawsContent(true);
@@ skipping 38 matching lines @@
     ASSERT_EQ(static_cast<size_t>(5), layerList.size());
     EXPECT_EQ(3, layerList[0]->id());
     EXPECT_EQ(4, layerList[1]->id());
     EXPECT_EQ(1, layerList[2]->id());
     EXPECT_EQ(2, layerList[3]->id());
     EXPECT_EQ(5, layerList[4]->id());
 }
 
 }  // namespace
 }  // namespace cc