CC Animation: Erase old animation system in Android Compositor.

chrome/browser/android/compositor/layer/content_layer.cc

 // Copyright 2014 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 "chrome/browser/android/compositor/layer/content_layer.h"
 
 #include "base/lazy_instance.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_lists.h"
+#include "cc/layers/layer_settings.h"
 #include "chrome/browser/android/compositor/layer/thumbnail_layer.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "content/public/browser/android/compositor.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace chrome {
 namespace android {
 
 // static
 scoped_refptr<ContentLayer> ContentLayer::Create(
@@ skipping 118 matching lines @@
   if (content_attached_ && DoesLeafDrawContents(layer()->children()[0]))
     return layer_->children()[0]->bounds();
   return gfx::Size(0, 0);
 }
 
 scoped_refptr<cc::Layer> ContentLayer::layer() {
   return layer_;
 }
 
 ContentLayer::ContentLayer(TabContentManager* tab_content_manager)
-    : layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
+    : layer_(cc::Layer::Create(cc::LayerSettings())),
       content_attached_(false),
       static_attached_(false),
       tab_content_manager_(tab_content_manager) {
 }
 
 ContentLayer::~ContentLayer() {
 }
 
 void ContentLayer::SetContentLayer(scoped_refptr<cc::Layer> layer) {
   // Check indices
@@ skipping 60 matching lines @@
 
 void ContentLayer::ClipStaticLayer(scoped_refptr<ThumbnailLayer> static_layer,
                                    gfx::Rect clipping) {
   if (!static_layer.get())
     return;
   static_layer->Clip(clipping);
 }
 
 }  //  namespace android
 }  //  namespace chrome