Revert r274404 and r274409:

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index bb70ba1b43a4c15a56a167b752dbde02372720b1..2b0d9138361dd46eabb0dbe199716c63c2256f3e 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -366,7 +366,6 @@ class COMPOSITOR_EXPORT Layer
   virtual void AddThreadedAnimation(
       scoped_ptr<cc::Animation> animation) OVERRIDE;
   virtual void RemoveThreadedAnimation(int animation_id) OVERRIDE;
-  virtual LayerAnimatorCollection* GetLayerAnimatorCollection() OVERRIDE;
 
   // Creates a corresponding composited layer for |type_|.
   void CreateWebLayer();
@@ -390,12 +389,6 @@ class COMPOSITOR_EXPORT Layer
   // be called once we have been added to a tree.
   void SendPendingThreadedAnimations();
 
-  void AddAnimatorsInTreeToCollection(LayerAnimatorCollection* collection);
-  void RemoveAnimatorsInTreeFromCollection(LayerAnimatorCollection* collection);
-
-  // Returns whether the layer has an animating LayerAnimator.
-  bool IsAnimating() const;
-
   const LayerType type_;
 
   Compositor* compositor_;