cc: Remove cc::settings, move them to LayerTreeSettings.

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 "cc/layer.h"
 
 #include "cc/keyframed_animation_curve.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_painter.h"
 #include "cc/layer_tree_host.h"
-#include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/thread.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/geometry_test_utils.h"
-#include "cc/test/test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 using ::testing::Mock;
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::AnyNumber;
@@ skipping 514 matching lines @@
 
     // If we do clear the LayerImpl side, then the next updateRect should be fresh without accumulation.
     implLayer->resetAllChangeTrackingForSubtree();
     testLayer->setNeedsDisplayRect(gfx::RectF(gfx::PointF(10, 10), gfx::SizeF(5, 5)));
     testLayer->pushPropertiesTo(implLayer.get());
     EXPECT_FLOAT_RECT_EQ(gfx::RectF(gfx::PointF(10, 10), gfx::SizeF(5, 5)), implLayer->updateRect());
 }
 
 class FakeLayerImplTreeHost : public LayerTreeHost {
 public:
-    static scoped_ptr<FakeLayerImplTreeHost> create()
+    static scoped_ptr<FakeLayerImplTreeHost> create(const LayerTreeSettings& settings = LayerTreeSettings())
     {
-        scoped_ptr<FakeLayerImplTreeHost> host(new FakeLayerImplTreeHost);
+        scoped_ptr<FakeLayerImplTreeHost> host(new FakeLayerImplTreeHost(settings));
         // The initialize call will fail, since our client doesn't provide a valid GraphicsContext3D, but it doesn't matter in the tests that use this fake so ignore the return value.
         host->initialize(scoped_ptr<Thread>(NULL));
         return host.Pass();
     }
 
 private:
-    FakeLayerImplTreeHost()
-        : LayerTreeHost(&m_client, LayerTreeSettings())
+    FakeLayerImplTreeHost(const LayerTreeSettings& settings)
+        : LayerTreeHost(&m_client, settings)
     {
     }
 
     FakeLayerImplTreeHostClient m_client;
 };
 
 void assertLayerTreeHostMatchesForSubtree(Layer* layer, LayerTreeHost* host)
 {
     EXPECT_EQ(host, layer->layerTreeHost());
 
@@ skipping 179 matching lines @@
     return layer->addAnimation(animation.Pass());
 }
 
 TEST(LayerLayerTreeHostTest, 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.
 
-    ScopedSettings scopedSettings;
-    Settings::setAcceleratedAnimationEnabled(true);
+    LayerTreeSettings settings;
+    settings.acceleratedAnimationEnabled = true;
 
     scoped_refptr<Layer> layer = Layer::create();
 
     // Case 1: without a layerTreeHost, the animation should not be accepted.
     EXPECT_FALSE(addTestAnimation(layer.get()));
 
-    scoped_ptr<FakeLayerImplTreeHost> layerTreeHost(FakeLayerImplTreeHost::create());
+    scoped_ptr<FakeLayerImplTreeHost> layerTreeHost(FakeLayerImplTreeHost::create(settings));
     layerTreeHost->setRootLayer(layer.get());
     layer->setLayerTreeHost(layerTreeHost.get());
     assertLayerTreeHostMatchesForSubtree(layer.get(), layerTreeHost.get());
 
     // Case 2: with a layerTreeHost, the animation should be accepted.
     EXPECT_TRUE(addTestAnimation(layer.get()));
 }
 
 class MockLayer : public Layer {
 public:
@@ skipping 10 matching lines @@
     scoped_refptr<MockLayer> layer(new MockLayer);
     EXPECT_FALSE(layer->needsDisplay());
     layer->setBounds(gfx::Size(0, 10));
     EXPECT_FALSE(layer->needsDisplay());
     layer->setBounds(gfx::Size(10, 10));
     EXPECT_TRUE(layer->needsDisplay());
 }
 
 }  // namespace
 }  // namespace cc