CC Animations: Make LayerAnimationController creation optional

cc/trees/occlusion_tracker_unittest.cc

 // Copyright 2012 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/trees/occlusion_tracker.h"
 
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 11 matching lines @@
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
 
 class TestContentLayer : public Layer {
  public:
-  TestContentLayer() : Layer(), override_opaque_contents_rect_(false) {
+  explicit TestContentLayer(const LayerSettings& settings)
+      : Layer(settings), override_opaque_contents_rect_(false) {
     SetIsDrawable(true);
   }
 
   SimpleEnclosedRegion VisibleContentOpaqueRegion() const override {
     if (override_opaque_contents_rect_) {
       return SimpleEnclosedRegion(
           gfx::IntersectRects(opaque_contents_rect_, visible_content_rect()));
     }
     return Layer::VisibleContentOpaqueRegion();
   }
@@ skipping 67 matching lines @@
 struct OcclusionTrackerTestMainThreadTypes {
   typedef Layer LayerType;
   typedef FakeLayerTreeHost HostType;
   typedef RenderSurface RenderSurfaceType;
   typedef TestContentLayer ContentLayerType;
   typedef scoped_refptr<Layer> LayerPtrType;
   typedef scoped_refptr<ContentLayerType> ContentLayerPtrType;
   typedef LayerIterator<Layer> TestLayerIterator;
   typedef OcclusionTracker<Layer> OcclusionTrackerType;
 
-  static LayerPtrType CreateLayer(HostType*  host) { return Layer::Create(); }
+  static LayerPtrType CreateLayer(HostType* host) {
+    return Layer::Create(LayerSettings());
+  }
   static ContentLayerPtrType CreateContentLayer(HostType* host) {
-    return make_scoped_refptr(new ContentLayerType());
+    return make_scoped_refptr(new ContentLayerType(LayerSettings()));
   }
 
   template <typename T>
   static LayerPtrType PassLayerPtr(T* layer) {
     LayerPtrType ref(*layer);
     *layer = NULL;
     return ref;
   }
   static void SetForceRenderSurface(LayerType* layer, bool force) {
     layer->SetForceRenderSurface(force);
@@ skipping 3190 matching lines @@
     EXPECT_EQ(gfx::Rect(),
               occlusion.UnoccludedSurfaceContentRect(
                   surface, gfx::Rect(80, 70, 50, 50)));
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestUnoccludedSurfaceQuery)
 
 }  // namespace
 }  // namespace cc