| Index: cc/threaded_unittest.cc
|
| diff --git a/cc/threaded_unittest.cc b/cc/threaded_unittest.cc
|
| index 6a323a90725dc767eba36f77b96dc05f45e5866c..9a5b2b88a30c2f4186dfecd4330a8869ff13403d 100644
|
| --- a/cc/threaded_unittest.cc
|
| +++ b/cc/threaded_unittest.cc
|
| @@ -24,6 +24,8 @@
|
| #include "cc/test/fake_web_graphics_context_3d.h"
|
| #include "cc/test/occlusion_tracker_test_common.h"
|
| #include "cc/test/tiled_layer_test_common.h"
|
| +#include "cc/test/test_common.h"
|
| +#include "cc/settings.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include <public/Platform.h>
|
| #include <public/WebCompositorSupport.h>
|
| @@ -526,7 +528,8 @@ void CCThreadedTest::dispatchDidAddAnimation()
|
| void CCThreadedTest::runTest(bool threaded)
|
| {
|
| // For these tests, we will enable threaded animations.
|
| - Platform::current()->compositorSupport()->setAcceleratedAnimationEnabled(true);
|
| + CCScopedSettings scopedSettings;
|
| + Settings::setAcceleratedAnimationEnabled(true);
|
|
|
| if (threaded) {
|
| m_webThread.reset(WebKit::Platform::current()->createThread("CCThreadedTest"));
|
|
|