CC Animations: Make LayerAnimationController creation optional

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

Index: chrome/browser/android/compositor/layer/contextual_search_layer.cc
diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.cc b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
index 23b96b27be7231dad97b698bd82f6c8afe7042ab..fbe567ca7186e4829232b241458ca8e84cc75c70 100644
--- a/chrome/browser/android/compositor/layer/contextual_search_layer.cc
+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
@@ -8,6 +8,7 @@
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
+#include "chrome/browser/android/compositor/layer/content_layer.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/resource_manager.h"
@@ -294,18 +295,29 @@ void ContextualSearchLayer::SetProperties(
 ContextualSearchLayer::ContextualSearchLayer(
     ui::ResourceManager* resource_manager)
     : resource_manager_(resource_manager),
-      layer_(cc::Layer::Create()),
-      search_bar_background_(cc::NinePatchLayer::Create()),
-      search_bar_text_(cc::UIResourceLayer::Create()),
-      search_bar_shadow_(cc::UIResourceLayer::Create()),
-      search_provider_icon_(cc::UIResourceLayer::Create()),
-      search_icon_(cc::UIResourceLayer::Create()),
-      content_view_container_(cc::Layer::Create()),
-      search_bar_border_(cc::SolidColorLayer::Create()),
-      progress_bar_(cc::NinePatchLayer::Create()),
-      progress_bar_background_(cc::NinePatchLayer::Create()),
-      search_promo_(cc::UIResourceLayer::Create()),
-      search_promo_container_(cc::SolidColorLayer::Create()) {
+      layer_(cc::Layer::Create(ContentLayer::ContentLayerSettings())),
+      search_bar_background_(
+          cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_bar_text_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_bar_shadow_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_provider_icon_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_icon_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      content_view_container_(
+          cc::Layer::Create(ContentLayer::ContentLayerSettings())),
+      search_bar_border_(
+          cc::SolidColorLayer::Create(ContentLayer::ContentLayerSettings())),
+      progress_bar_(
+          cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+      progress_bar_background_(
+          cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_promo_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_promo_container_(
+          cc::SolidColorLayer::Create(ContentLayer::ContentLayerSettings())) {
   layer_->SetMasksToBounds(false);
   layer_->SetIsDrawable(true);