CC Animations: Make LayerAnimationController creation optional

chrome/browser/android/compositor/layer/thumbnail_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/thumbnail_layer.h"
 
 #include "cc/layers/ui_resource_layer.h"
+#include "chrome/browser/android/compositor/layer/content_layer.h"
 #include "chrome/browser/android/thumbnail/thumbnail.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace chrome {
 namespace android {
 
 // static
 scoped_refptr<ThumbnailLayer> ThumbnailLayer::Create() {
   return make_scoped_refptr(new ThumbnailLayer());
 }
@@ skipping 24 matching lines @@
   if (index >= parent->children().size())
     parent->AddChild(layer_);
   else if (parent->child_at(index)->id() != layer_->id())
     parent->ReplaceChild(parent->child_at(index), layer_);
 }
 
 scoped_refptr<cc::Layer> ThumbnailLayer::layer() {
   return layer_;
 }
 
-ThumbnailLayer::ThumbnailLayer() : layer_(cc::UIResourceLayer::Create()) {
+ThumbnailLayer::ThumbnailLayer()
+    : layer_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())) {
   layer_->SetIsDrawable(true);
 }
 
 ThumbnailLayer::~ThumbnailLayer() {
 }
 
 void ThumbnailLayer::UpdateSizes(const gfx::SizeF& content_size,
                                  const gfx::SizeF& resource_size) {
   if (content_size != content_size_ || resource_size != resource_size_) {
     content_size_ = content_size;
     resource_size_ = resource_size;
     Clip(last_clipping_);
   }
 }
 
 }  // namespace android
 }  // namespace chrome