Merge AnimationTimeline and DocumentTimeline

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

Index: third_party/WebKit/Source/core/animation/AnimationTest.cpp
diff --git a/third_party/WebKit/Source/core/animation/AnimationTest.cpp b/third_party/WebKit/Source/core/animation/AnimationTest.cpp
index 6c2f2dd75066779a23edae8deeaf7e5aef4da9e1..006024a5a01e57258f103ce9a2de5e502ba25e0c 100644
--- a/third_party/WebKit/Source/core/animation/AnimationTest.cpp
+++ b/third_party/WebKit/Source/core/animation/AnimationTest.cpp
@@ -32,8 +32,8 @@
 
 #include <memory>
 #include "core/animation/AnimationClock.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/dom/DOMNodeIds.h"
@@ -63,7 +63,7 @@ class AnimationAnimationTest : public RenderingTest {
     page_holder = DummyPageHolder::Create();
     document = &page_holder->GetDocument();
     document->GetAnimationClock().ResetTimeForTesting();
-    timeline = AnimationTimeline::Create(document.Get());
+    timeline = DocumentTimeline::Create(document.Get());
     timeline->ResetForTesting();
     animation = timeline->Play(0);
     animation->setStartTime(0, false);
@@ -92,7 +92,7 @@ class AnimationAnimationTest : public RenderingTest {
   }
 
   Persistent<Document> document;
-  Persistent<AnimationTimeline> timeline;
+  Persistent<DocumentTimeline> timeline;
   Persistent<Animation> animation;
   std::unique_ptr<DummyPageHolder> page_holder;
 };