Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(624)

Unified Diff: cc/threaded_unittest.cc

Issue 11186039: Move CC switches to cc/switches.h. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add cc to DEPS in chrome/ and content/ Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/threaded_unittest.cc
diff --git a/cc/threaded_unittest.cc b/cc/threaded_unittest.cc
index ebeaa7021c3fd69ee5e1e407acb1e00beaee690c..be383f96a2746e3b704666d41a0e2689bd8bafe2 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;
+ CCSettings::setAcceleratedAnimationEnabledForTest(true);
if (threaded) {
m_webThread = adoptPtr(WebKit::Platform::current()->createThread("CCThreadedTest"));

Powered by Google App Engine
This is Rietveld 408576698