CC Animation: Merge LayerAnimationController into ElementAnimations.

cc/layers/layer.cc

 // Copyright 2010 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/layers/layer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1450 matching lines @@
       base->add_clip_children_ids(child->id());
   }
 
   ScrollOffsetToProto(scroll_offset_, base->mutable_scroll_offset());
 
   // TODO(nyquist): Figure out what to do with CopyRequests.
   // See crbug.com/570374.
 
   RectToProto(update_rect_, base->mutable_update_rect());
 
-  // TODO(nyquist): Figure out what to do with LayerAnimationController.
+  // TODO(nyquist): Figure out what to do with ElementAnimations.
   // See crbug.com/570376.
 
   update_rect_ = gfx::Rect();
 }
 
 void Layer::FromLayerSpecificPropertiesProto(
     const proto::LayerProperties& proto) {
   DCHECK(proto.has_base());
   DCHECK(layer_tree_host_);
   const proto::BaseLayerProperties& base = proto.base();
@@ skipping 338 matching lines @@
       ->data.num_copy_requests_in_subtree;
 }
 
 gfx::Transform Layer::screen_space_transform() const {
   DCHECK_NE(transform_tree_index_, -1);
   return draw_property_utils::ScreenSpaceTransform(
       this, layer_tree_host_->property_trees()->transform_tree);
 }
 
 }  // namespace cc