| Index: cc/TreeSynchronizerTest.cpp
|
| diff --git a/cc/TreeSynchronizerTest.cpp b/cc/TreeSynchronizerTest.cpp
|
| index e1c811b8def9abcb584316542f87e62f2f0cc1d5..abc38e6379a5fa69f419849ee8478421e1f34c14 100644
|
| --- a/cc/TreeSynchronizerTest.cpp
|
| +++ b/cc/TreeSynchronizerTest.cpp
|
| @@ -77,9 +77,9 @@ private:
|
|
|
| class FakeLayerAnimationController : public CCLayerAnimationController {
|
| public:
|
| - static PassOwnPtr<FakeLayerAnimationController> create(CCLayerAnimationControllerClient* client)
|
| + static scoped_ptr<FakeLayerAnimationController> create(CCLayerAnimationControllerClient* client)
|
| {
|
| - return adoptPtr(new FakeLayerAnimationController(client));
|
| + return make_scoped_ptr(new FakeLayerAnimationController(client));
|
| }
|
|
|
| bool synchronizedAnimations() const { return m_synchronizedAnimations; }
|
| @@ -392,7 +392,7 @@ TEST(TreeSynchronizerTest, synchronizeAnimations)
|
| scoped_refptr<LayerChromium> layerTreeRoot = LayerChromium::create();
|
|
|
| FakeLayerAnimationControllerClient dummy;
|
| - layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create(&dummy));
|
| + layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create(&dummy).PassAs<CCLayerAnimationController>());
|
|
|
| EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerAnimationController())->synchronizedAnimations());
|
|
|
|
|