Move CC switches to cc/switches.h.

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 "config.h"
 
 #include "cc/layer.h"
 
 #include "CCKeyframedAnimationCurve.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
 #include "CCSingleThreadProxy.h"
 #include "cc/layer_painter.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/web_compositor_initializer.h"
+#include "cc/test/test_common.h"
+#include "cc/settings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
 using namespace cc;
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 using ::testing::Mock;
 using ::testing::_;
 using ::testing::AtLeast;
@@ skipping 772 matching lines @@
     return layer->addAnimation(animation.Pass());
 }
 
 TEST(LayerChromiumLayerTreeHostTest, shouldNotAddAnimationWithoutLayerTreeHost)
 {
     // Currently, WebCore assumes that animations will be started immediately / very soon
     // if a composited layer's addAnimation() returns true. However, without a layerTreeHost,
     // layers cannot actually animate yet. So, to prevent violating this WebCore assumption,
     // the animation should not be accepted if the layer doesn't already have a layerTreeHost.
 
-    WebKit::Platform::current()->compositorSupport()->setAcceleratedAnimationEnabled(true);
+    CCScopedSettings scopedSettings;
+    CCSettings::setAcceleratedAnimationEnabledForTest(true);
 
     WebCompositorInitializer compositorInitializer(0);
     scoped_refptr<LayerChromium> layer = LayerChromium::create();
 
     // Case 1: without a layerTreeHost, the animation should not be accepted.
     EXPECT_FALSE(addTestAnimation(layer.get()));
 
     scoped_ptr<FakeCCLayerTreeHost> layerTreeHost(FakeCCLayerTreeHost::create());
     layerTreeHost->setRootLayer(layer.get());
     layer->setLayerTreeHost(layerTreeHost.get());
@@ skipping 18 matching lines @@
     scoped_refptr<MockLayerChromium> layer(new MockLayerChromium);
     EXPECT_FALSE(layer->needsDisplay());
     layer->setBounds(IntSize(0, 10));
     EXPECT_FALSE(layer->needsDisplay());
     layer->setBounds(IntSize(10, 10));
     EXPECT_TRUE(layer->needsDisplay());
 }
 
 
 } // namespace