DevTools: merge TracingTimelineModel into TimelineModel

LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations-on-deleted-node.html

Index: LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations-on-deleted-node.html
diff --git a/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations-on-deleted-node.html b/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations-on-deleted-node.html
index 4db7addfdb2b4405cbbe97669bc1d1c228165aee..454a7f53516656e2ed89426e6ee8e9ec263d5be4 100644
--- a/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations-on-deleted-node.html
+++ b/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations-on-deleted-node.html
@@ -42,17 +42,17 @@ function test()
                 var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.Paint);
                 var invalidations = record._event.invalidationTrackingEvents;
                 InspectorTest.assertEquals(invalidations.length, 5);
-                InspectorTest.assertEquals(invalidations[0].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
+                InspectorTest.assertEquals(invalidations[0].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
                 InspectorTest.assertEquals(invalidations[0].nodeName, "BODY");
-                InspectorTest.assertEquals(invalidations[1].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
+                InspectorTest.assertEquals(invalidations[1].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
                 InspectorTest.assertEquals(invalidations[1].nodeName, "DIV id='testElement'");
-                InspectorTest.assertEquals(invalidations[2].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
+                InspectorTest.assertEquals(invalidations[2].type, WebInspector.TimelineModel.RecordType.LayoutInvalidationTracking);
                 InspectorTest.assertEquals(invalidations[2].nodeName, "DIV id='testElement'");
                 InspectorTest.assertGreaterOrEqual(invalidations[2].stackTrace.length, 1);
-                InspectorTest.assertEquals(invalidations[3].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
+                InspectorTest.assertEquals(invalidations[3].type, WebInspector.TimelineModel.RecordType.LayoutInvalidationTracking);
                 InspectorTest.assertEquals(invalidations[3].nodeName, "#text");
                 InspectorTest.assertGreaterOrEqual(invalidations[3].stackTrace.length, 1);
-                InspectorTest.assertEquals(invalidations[4].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
+                InspectorTest.assertEquals(invalidations[4].type, WebInspector.TimelineModel.RecordType.LayoutInvalidationTracking);
                 InspectorTest.assertEquals(invalidations[4].nodeName, "DIV id='testElement'");
                 InspectorTest.assertGreaterOrEqual(invalidations[3].stackTrace.length, 1);
 
@@ -72,12 +72,12 @@ function test()
                 var secondPaintRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.Paint, 1);
                 var secondInvalidations = secondPaintRecord._event.invalidationTrackingEvents;
                 InspectorTest.assertEquals(secondInvalidations.length, 3);
-                InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
+                InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
                 InspectorTest.assertEquals(secondInvalidations[0].nodeName, "DIV");
-                InspectorTest.assertEquals(secondInvalidations[1].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
+                InspectorTest.assertEquals(secondInvalidations[1].type, WebInspector.TimelineModel.RecordType.LayoutInvalidationTracking);
                 InspectorTest.assertEquals(secondInvalidations[1].nodeName, "DIV");
                 InspectorTest.assertGreaterOrEqual(secondInvalidations[1].stackTrace.length, 1);
-                InspectorTest.assertEquals(secondInvalidations[2].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
+                InspectorTest.assertEquals(secondInvalidations[2].type, WebInspector.TimelineModel.RecordType.LayoutInvalidationTracking);
                 InspectorTest.assertEquals(secondInvalidations[2].nodeName, "DIV");
                 InspectorTest.assertGreaterOrEqual(secondInvalidations[2].stackTrace.length, 1);