CC Animation: Erase old animation system in UI Compositor.

ui/compositor/layer_owner_unittest.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 "ui/compositor/layer_owner.h"
 
 #include "base/macros.h"
 #include "base/test/null_task_runner.h"
 #include "cc/animation/animation_player.h"
 #include "cc/layers/layer_settings.h"
@@ skipping 210 matching lines @@
     transform.Scale(0.5f, 0.5f);
     child->SetTransform(transform);
   }
 
   scoped_ptr<Layer> layer_copy = owner.RecreateLayer();
 }
 
 // Tests that if LayerOwner-derived class destroys layer, then
 // LayerAnimator's player becomes detached from compositor timeline.
 TEST_F(LayerOwnerTestWithCompositor, DetachTimelineOnAnimatorDeletion) {
-  // This test is meaningless if CC timelines disabled.
-  if (!Layer::UILayerSettings().use_compositor_animation_timelines)
-    return;
-
   scoped_ptr<Layer> root_layer(new Layer);
   compositor()->SetRootLayer(root_layer.get());
 
   LayerOwnerForTesting owner;
   Layer* layer = new Layer;
   owner.SetLayer(layer);
   layer->SetOpacity(0.5f);
   root_layer->Add(layer);
 
   scoped_refptr<cc::AnimationPlayer> player =
       layer->GetAnimator()->GetAnimationPlayerForTesting();
   EXPECT_TRUE(player);
   EXPECT_TRUE(player->animation_timeline());
 
   // Destroying layer/animator must detach animator's player from timeline.
   owner.DestroyLayerForTesting();
   EXPECT_FALSE(player->animation_timeline());
 }
 
 // Tests that if we run threaded opacity animation on already added layer
 // then LayerAnimator's player becomes attached to timeline.
 TEST_F(LayerOwnerTestWithCompositor,
        AttachTimelineIfAnimatorCreatedAfterSetCompositor) {
-  // This test is meaningless if CC timelines disabled.
-  if (!Layer::UILayerSettings().use_compositor_animation_timelines)
-    return;
-
   scoped_ptr<Layer> root_layer(new Layer);
   compositor()->SetRootLayer(root_layer.get());
 
   LayerOwner owner;
   Layer* layer = new Layer;
   owner.SetLayer(layer);
   root_layer->Add(layer);
 
   layer->SetOpacity(0.5f);
 
   scoped_refptr<cc::AnimationPlayer> player =
       layer->GetAnimator()->GetAnimationPlayerForTesting();
   EXPECT_TRUE(player);
   EXPECT_TRUE(player->animation_timeline());
 }
 
 }  // namespace ui