DevTools: merge TracingTimelineModel into TimelineModel

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

Index: LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations.html
diff --git a/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations.html b/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations.html
index 9749f736992f4757a62de36697fb9f8ae1041c74..9bdc4a41434eb8bca6b07bb46842577f52b13b4e 100644
--- a/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations.html
+++ b/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations.html
@@ -38,13 +38,13 @@ function test()
                 var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.Paint);
                 var invalidations = record._event.invalidationTrackingEvents;
                 InspectorTest.assertEquals(invalidations.length, 3);
-                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[0].reason, "StyleSheetChange");
-                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[1].reason, "StyleSheetChange");
-                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);
 
@@ -64,13 +64,13 @@ 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[0].reason, "StyleSheetChange");
-                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, "#document");
                 InspectorTest.assertGreaterOrEqual(secondInvalidations[2].stackTrace.length, 1);