CC Animation: Erase cc::LayerSettings everywhere.

cc/test/layer_test_common.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/test/layer_test_common.h"
 
 #include <stddef.h>
 
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_output_surface.h"
-#include "cc/test/layer_tree_settings_for_testing.h"
 #include "cc/test/mock_occlusion_tracker.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace cc {
 
@@ skipping 79 matching lines @@
       EXPECT_EQ(quad->rect.ToString(), quad->visible_rect.ToString());
     } else {
       EXPECT_NE(quad->rect.ToString(), quad->visible_rect.ToString());
       EXPECT_TRUE(quad->rect.Contains(quad->visible_rect));
       ++(*partially_occluded_count);
     }
   }
 }
 
 LayerTestCommon::LayerImplTest::LayerImplTest()
-    : LayerImplTest(LayerTreeSettingsForTesting()) {}
+    : LayerImplTest(LayerTreeSettings()) {}
 
 LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
     : client_(FakeLayerTreeHostClient::DIRECT_3D),
       output_surface_(FakeOutputSurface::Create3d()),
       host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)),
       root_layer_impl_(LayerImpl::Create(host_->host_impl()->active_tree(), 1)),
       render_pass_(RenderPass::Create()),
       layer_impl_id_(2) {
   root_layer_impl_->SetHasRenderSurface(true);
   host_->host_impl()->SetVisible(true);
   host_->host_impl()->InitializeRenderer(output_surface_.get());
 
-  if (host_->settings().use_compositor_animation_timelines) {
-    const int timeline_id = AnimationIdProvider::NextTimelineId();
-    timeline_ = AnimationTimeline::Create(timeline_id);
-    host_->animation_host()->AddAnimationTimeline(timeline_);
-    // Create impl-side instance.
-    host_->animation_host()->PushPropertiesTo(
-        host_->host_impl()->animation_host());
-    timeline_impl_ =
-        host_->host_impl()->animation_host()->GetTimelineById(timeline_id);
-  }
+  const int timeline_id = AnimationIdProvider::NextTimelineId();
+  timeline_ = AnimationTimeline::Create(timeline_id);
+  host_->animation_host()->AddAnimationTimeline(timeline_);
+  // Create impl-side instance.
+  host_->animation_host()->PushPropertiesTo(
+      host_->host_impl()->animation_host());
+  timeline_impl_ =
+      host_->host_impl()->animation_host()->GetTimelineById(timeline_id);
 }
 
 LayerTestCommon::LayerImplTest::~LayerImplTest() {
-  if (host_->settings().use_compositor_animation_timelines) {
-    host_->animation_host()->RemoveAnimationTimeline(timeline_);
-    timeline_ = nullptr;
-  }
+  host_->animation_host()->RemoveAnimationTimeline(timeline_);
+  timeline_ = nullptr;
 }
 
 void LayerTestCommon::LayerImplTest::CalcDrawProps(
     const gfx::Size& viewport_size) {
   LayerImplList layer_list;
   host_->host_impl()->active_tree()->IncrementRenderSurfaceListIdForTesting();
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_layer_impl_.get(), viewport_size, &layer_list,
       host_->host_impl()->active_tree()->current_render_surface_list_id());
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ skipping 52 matching lines @@
 void EmptyCopyOutputCallback(scoped_ptr<CopyOutputResult> result) {}
 
 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() {
   std::vector<scoped_ptr<CopyOutputRequest>> copy_requests;
   copy_requests.push_back(
       CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback)));
   root_layer_impl_->PassCopyRequests(&copy_requests);
 }
 
 }  // namespace cc