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

cc/test/layer_tree_test_common.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/test/layer_tree_test_common.h"
 
 #include "base/stl_util.h"
 #include "cc/active_animation.h"
 #include "cc/content_layer.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/scoped_thread_proxy.h"
-#include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/thread_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
 #include "cc/test/occlusion_tracker_test_common.h"
-#include "cc/test/test_common.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
 using cc::InputHandler;
 using cc::Layer;
 using cc::LayerTreeHostImplClient;
 using cc::LayerTreeSettings;
 using cc::Proxy;
 using cc::ScopedThreadProxy;
-using cc::Settings;
 
 using namespace WebKit;
 
 namespace WebKitTests {
 
 scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFakeWebGraphicsContext3DWithTextureTracking::create(Attributes attrs)
 {
     return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTracking(attrs));
 }
 
@@ skipping 450 matching lines @@
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get())
         m_layerTreeHost->didAddAnimation();
 }
 
 void ThreadedTest::runTest(bool threaded)
 {
-    // For these tests, we will enable threaded animations.
-    ScopedSettings scopedSettings;
-    Settings::setAcceleratedAnimationEnabled(true);
-
     if (threaded) {
         m_implThread.reset(new base::Thread("ThreadedTest"));
         ASSERT_TRUE(m_implThread->Start());
     }
 
     m_mainCCThread = cc::ThreadImpl::createForCurrentThread();
     m_mainThreadProxy = ScopedThreadProxy::create(m_mainCCThread.get());
 
     initializeSettings(m_settings);
 
@@ skipping 10 matching lines @@
     ASSERT_FALSE(m_layerTreeHost.get());
     m_client.reset();
     if (m_timedOut) {
         FAIL() << "Test timed out";
         return;
     }
     afterTest();
 }
 
 }  // namespace WebKitTests