Move trace event based implementation parts of TimelineModel into TracingTimelineModel

LayoutTests/inspector/tracing-test.js

Index: LayoutTests/inspector/tracing-test.js
diff --git a/LayoutTests/inspector/tracing-test.js b/LayoutTests/inspector/tracing-test.js
index bc1c7b0ed82585fc59fd64d66c9201dfcdbbf21c..78cf3fd407ce5180389c2762ab41f8247f2f69a5 100644
--- a/LayoutTests/inspector/tracing-test.js
+++ b/LayoutTests/inspector/tracing-test.js
@@ -4,19 +4,29 @@ function initialize_TracingTest()
 // FIXME: remove when tracing is out of experimental
 WebInspector.inspectorView.showPanel("timeline");
 InspectorTest.tracingModel = new WebInspector.TracingModel();
+InspectorTest.tracingTimelineModel = new WebInspector.TracingTimelineModel(InspectorTest.tracingModel);
 
 InspectorTest.invokeWithTracing = function(categoryFilter, functionName, callback)
 {
-    InspectorTest.tracingModel.start(categoryFilter, "", onTracingStarted);
+    InspectorTest.tracingTimelineModel.addEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onTracingStarted, this);
+    InspectorTest.tracingTimelineModel._startRecordingWithCategories(categoryFilter);
 
-    function onTracingStarted(error)
+    function onTracingStarted(event)
     {
+        InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onTracingStarted, this);
         InspectorTest.invokePageFunctionAsync(functionName, onPageActionsDone);
     }
 
     function onPageActionsDone()
     {
-        InspectorTest.tracingModel.stop(InspectorTest.safeWrap(callback));
+        InspectorTest.tracingTimelineModel.addEventListener(WebInspector.TimelineModel.Events.RecordingStopped, onTracingComplete, this);
+        InspectorTest.tracingTimelineModel.stopRecording();
+    }
+
+    function onTracingComplete(event)
+    {
+        InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.TimelineModel.Events.RecordingStopped, onTracingComplete, this);
+        callback();
     }
 }