CC Animation: Merge LayerAnimationController into ElementAnimations.

cc/cc.gyp

 # Copyright (c) 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 36 matching lines @@
         'animation/animation_id_provider.cc',
         'animation/animation_id_provider.h',
         'animation/animation_player.cc',
         'animation/animation_player.h',
         'animation/animation_timeline.cc',
         'animation/animation_timeline.h',
         'animation/element_animations.cc',
         'animation/element_animations.h',
         'animation/keyframed_animation_curve.cc',
         'animation/keyframed_animation_curve.h',
-        'animation/layer_animation_controller.cc',
-        'animation/layer_animation_controller.h',
-        'animation/layer_animation_value_observer.h',
-        'animation/layer_animation_value_provider.h',
         'animation/scroll_offset_animation_curve.cc',
         'animation/scroll_offset_animation_curve.h',
         'animation/target_property.cc',
         'animation/target_property.h',
         'animation/timing_function.cc',
         'animation/timing_function.h',
         'animation/transform_operation.cc',
         'animation/transform_operation.h',
         'animation/transform_operations.cc',
         'animation/transform_operations.h',
@@ skipping 627 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }