cc: Pass LayerTreeHostImpl to LayerImpl constructor

cc/layer_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.h"
 
 #include "cc/keyframed_animation_curve.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_painter.h"
 #include "cc/layer_tree_host.h"
 #include "cc/math_util.h"
 #include "cc/single_thread_proxy.h"
+#include "cc/test/fake_impl_proxy.h"
+#include "cc/test/fake_layer_tree_host_client.h"
+#include "cc/test/fake_layer_tree_host_impl.h"
+#include "cc/test/geometry_test_utils.h"
 #include "cc/thread.h"
-#include "cc/test/fake_layer_tree_host_client.h"
-#include "cc/test/geometry_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/transform.h"
 
 using ::testing::AnyNumber;
 using ::testing::AtLeast;
 using ::testing::Mock;
 using ::testing::StrictMock;
 using ::testing::_;
 
@@ skipping 30 matching lines @@
 
 class MockLayerPainter : public LayerPainter {
 public:
     virtual void paint(SkCanvas*, const gfx::Rect&, gfx::RectF&) OVERRIDE { }
 };
 
 
 class LayerTest : public testing::Test {
 public:
     LayerTest()
+        : m_hostImpl(&m_proxy)
     {
     }
 
 protected:
     virtual void SetUp()
     {
         m_layerTreeHost.reset(new StrictMock<MockLayerImplTreeHost>);
     }
 
     virtual void TearDown()
@@ skipping 53 matching lines @@
         m_parent->addChild(m_child3);
         m_child1->addChild(m_grandChild1);
         m_child1->addChild(m_grandChild2);
         m_child2->addChild(m_grandChild3);
 
         Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
 
         verifyTestTreeInitialState();
     }
 
+    FakeImplProxy m_proxy;
+    FakeLayerTreeHostImpl m_hostImpl;
+
     scoped_ptr<StrictMock<MockLayerImplTreeHost> > m_layerTreeHost;
-    scoped_refptr<Layer> m_parent, m_child1, m_child2, m_child3, m_grandChild1, m_grandChild2, m_grandChild3;
+    scoped_refptr<Layer> m_parent;
+    scoped_refptr<Layer> m_child1;
+    scoped_refptr<Layer> m_child2;
+    scoped_refptr<Layer> m_child3;
+    scoped_refptr<Layer> m_grandChild1;
+    scoped_refptr<Layer> m_grandChild2;
+    scoped_refptr<Layer> m_grandChild3;
 };
 
 TEST_F(LayerTest, basicCreateAndDestroy)
 {
     scoped_refptr<Layer> testLayer = Layer::create();
     ASSERT_TRUE(testLayer);
 
     EXPECT_CALL(*m_layerTreeHost, setNeedsCommit()).Times(0);
     testLayer->setLayerTreeHost(m_layerTreeHost.get());
 }
@@ skipping 389 matching lines @@
     EXPECT_FALSE(testLayer->needsDisplay());
 
     // Test properties that should call setNeedsDisplay and setNeedsCommit
     EXPECT_SET_NEEDS_COMMIT(1, testLayer->setBounds(gfx::Size(5, 10)));
     EXPECT_TRUE(testLayer->needsDisplay());
 }
 
 TEST_F(LayerTest, verifyPushPropertiesAccumulatesUpdateRect)
 {
     scoped_refptr<Layer> testLayer = Layer::create();
-    scoped_ptr<LayerImpl> implLayer = LayerImpl::create(1);
+    scoped_ptr<LayerImpl> implLayer = LayerImpl::create(&m_hostImpl, 1);
 
     testLayer->setNeedsDisplayRect(gfx::RectF(gfx::PointF(), gfx::SizeF(5, 5)));
     testLayer->pushPropertiesTo(implLayer.get());
     EXPECT_FLOAT_RECT_EQ(gfx::RectF(gfx::PointF(), gfx::SizeF(5, 5)), implLayer->updateRect());
 
     // The LayerImpl's updateRect should be accumulated here, since we did not do anything to clear it.
     testLayer->setNeedsDisplayRect(gfx::RectF(gfx::PointF(10, 10), gfx::SizeF(5, 5)));
     testLayer->pushPropertiesTo(implLayer.get());
     EXPECT_FLOAT_RECT_EQ(gfx::RectF(gfx::PointF(), gfx::SizeF(15, 15)), implLayer->updateRect());
 
@@ skipping 251 matching lines @@
     scoped_refptr<MockLayer> layer(new MockLayer);
     EXPECT_FALSE(layer->needsDisplay());
     layer->setBounds(gfx::Size(0, 10));
     EXPECT_FALSE(layer->needsDisplay());
     layer->setBounds(gfx::Size(10, 10));
     EXPECT_TRUE(layer->needsDisplay());
 }
 
 }  // namespace
 }  // namespace cc