1 files changed, 11 insertions, 17 deletions
diff --git a/third_party/WebKit/LayoutTests/transitions/transition-end-event-attributes.html b/third_party/WebKit/LayoutTests/transitions/transition-end-event-attributes.html
index 4bac84e..b53a22f 100644
--- a/third_party/WebKit/LayoutTests/transitions/transition-end-event-attributes.html
+++ b/third_party/WebKit/LayoutTests/transitions/transition-end-event-attributes.html
@@ -13,28 +13,22 @@
       -webkit-transition-duration: 0.5s;
     }
   </style>
-  <script src="end-event-helpers.js" type="text/javascript" charset="utf-8"></script>
+  <script src="transition-end-event-helpers.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
-    }
     
-    var expected = [
-      ['left', 'box1', 'webkitTransitionEnd', 0.5]
+    var expectedEndEvents = [
+      // [property-name, element-id, elapsed-time, listen]
+      ["left", "box1", 0.5]
     ];
-
-    function startTransition()
+    
+    function setupTest()
     {
-      var boxes = document.body.getElementsByClassName('box');
-      for (var i = 0; i < boxes.length; ++i) {
-        boxes[i].style.left = '200px';
-      }
-      
-      window.setTimeout(cleanup, 700);
+      var box = document.getElementById('box1');
+      box.style.left = '200px';
     }
     
-    window.addEventListener('load', startTransition, false);
+    runTransitionTest(expectedEndEvents, 0.7, setupTest);
+    
   </script>
 </head>
 <body>
@@ -42,7 +36,7 @@
 <p>Initiating a 500ms transition on the left property of box1.</p>
 
 <div id="container">
-  <div id="box1" class="box" onwebkittransitionend="recordEvent(event);"></div>
+  <div id="box1" class="box" onwebkittransitionend="recordTransitionEndEvent(event);"></div>
 </div>
 
 <div id="result"></div>