Merge AnimationTimeline and DocumentTimeline

third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp

Index: third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
index 0618730cbd25cb9498efcf40e79f2842cb87831d..d0b7975220eb8ffd8785cc606d959182d7520f68 100644
--- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
+++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
@@ -32,8 +32,8 @@
 
 #include <memory>
 #include "core/animation/Animation.h"
-#include "core/animation/AnimationTimeline.h"
 #include "core/animation/CompositorPendingAnimations.h"
+#include "core/animation/DocumentTimeline.h"
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/KeyframeEffect.h"
 #include "core/animation/animatable/AnimatableDouble.h"
@@ -77,7 +77,7 @@ class AnimationCompositorAnimationsTest : public ::testing::Test {
 
   Persistent<Document> document_;
   Persistent<Element> element_;
-  Persistent<AnimationTimeline> timeline_;
+  Persistent<DocumentTimeline> timeline_;
   std::unique_ptr<DummyPageHolder> page_holder_;
 
   void SetUp() override {
@@ -108,7 +108,7 @@ class AnimationCompositorAnimationsTest : public ::testing::Test {
     document_ = &page_holder_->GetDocument();
     document_->GetAnimationClock().ResetTimeForTesting();
 
-    timeline_ = AnimationTimeline::Create(document_.Get());
+    timeline_ = DocumentTimeline::Create(document_.Get());
     timeline_->ResetForTesting();
     element_ = document_->createElement("test");
   }