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

cc/content_layer.cc

 // Copyright 2010 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/content_layer.h"
 
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "cc/bitmap_content_layer_updater.h"
 #include "cc/bitmap_skpicture_content_layer_updater.h"
 #include "cc/content_layer_client.h"
 #include "cc/layer_painter.h"
 #include "cc/layer_tree_host.h"
-#include "cc/settings.h"
 
 namespace cc {
 
 ContentLayerPainter::ContentLayerPainter(ContentLayerClient* client)
     : m_client(client)
 {
 }
 
 scoped_ptr<ContentLayerPainter> ContentLayerPainter::create(ContentLayerClient* client)
 {
@@ skipping 55 matching lines @@
     return m_updater.get();
 }
 
 void ContentLayer::createUpdaterIfNeeded()
 {
     if (m_updater)
         return;
     scoped_ptr<LayerPainter> painter = ContentLayerPainter::create(m_client).PassAs<LayerPainter>();
     if (layerTreeHost()->settings().acceleratePainting)
         m_updater = SkPictureContentLayerUpdater::create(painter.Pass());
-    else if (Settings::perTilePaintingEnabled())
+    else if (layerTreeHost()->settings().perTilePaintingEnabled)
         m_updater = BitmapSkPictureContentLayerUpdater::create(painter.Pass());
     else
         m_updater = BitmapContentLayerUpdater::create(painter.Pass());
     m_updater->setOpaque(contentsOpaque());
 
     GLenum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
     setTextureFormat(textureFormat);
 }
 
 void ContentLayer::setContentsOpaque(bool opaque)
 {
     Layer::setContentsOpaque(opaque);
     if (m_updater)
         m_updater->setOpaque(opaque);
 }
 
 }  // namespace cc