Index: cc/tree_synchronizer_unittest.cc |
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc |
index ae274433645831461a38c92afe2caeccb9cf8016..104325f97b3052348b9ff2c46c279050daafa8a1 100644 |
--- a/cc/tree_synchronizer_unittest.cc |
+++ b/cc/tree_synchronizer_unittest.cc |
@@ -77,19 +77,20 @@ private: |
class FakeLayerAnimationController : public LayerAnimationController { |
public: |
- static scoped_ptr<FakeLayerAnimationController> create(LayerAnimationControllerClient* client) |
+ static scoped_refptr<LayerAnimationController> create() |
{ |
- return make_scoped_ptr(new FakeLayerAnimationController(client)); |
+ return static_cast<LayerAnimationController*>(new FakeLayerAnimationController); |
} |
bool synchronizedAnimations() const { return m_synchronizedAnimations; } |
private: |
- explicit FakeLayerAnimationController(LayerAnimationControllerClient* client) |
- : LayerAnimationController(client) |
+ FakeLayerAnimationController() |
+ : LayerAnimationController(AnimationRegistrar::MainThread) |
, m_synchronizedAnimations(false) |
- { |
- } |
+ { } |
+ |
+ virtual ~FakeLayerAnimationController() { } |
virtual void pushAnimationUpdatesTo(LayerAnimationController* controllerImpl) |
{ |
@@ -394,8 +395,7 @@ TEST(TreeSynchronizerTest, synchronizeAnimations) |
scoped_refptr<Layer> layerTreeRoot = Layer::create(); |
- FakeLayerAnimationControllerClient dummy; |
- layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create(&dummy).PassAs<LayerAnimationController>()); |
+ layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create()); |
EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerAnimationController())->synchronizedAnimations()); |