DevTools: merge TracingTimelineModel into TimelineModel

Source/devtools/front_end/timeline/TimelineJSProfile.js

Index: Source/devtools/front_end/timeline/TimelineJSProfile.js
diff --git a/Source/devtools/front_end/timeline/TimelineJSProfile.js b/Source/devtools/front_end/timeline/TimelineJSProfile.js
index a0b46c4a71f11d2b2629c1a7dcedb37988138827..896153fe2dea87c9536206cbacc622d38969b214 100644
--- a/Source/devtools/front_end/timeline/TimelineJSProfile.js
+++ b/Source/devtools/front_end/timeline/TimelineJSProfile.js
@@ -6,7 +6,7 @@
 WebInspector.TimelineJSProfileProcessor = { };
 
 /**
- * @param {!WebInspector.TracingTimelineModel} timelineModel
+ * @param {!WebInspector.TimelineModel} timelineModel
  * @param {!ProfilerAgent.CPUProfile} jsProfile
  * @return {!Array.<!WebInspector.TracingModel.Event>}
  */
@@ -33,7 +33,7 @@ WebInspector.TimelineJSProfileProcessor.generateTracingEventsFromCpuProfile = fu
             for (var j = 0; node.parent; node = node.parent)
                 stackTrace[j++] = /** @type {!ConsoleAgent.CallFrame} */ (node);
         }
-        var jsEvent = new WebInspector.TracingModel.Event(WebInspector.TracingModel.DevToolsMetadataEventCategory, WebInspector.TracingTimelineModel.RecordType.JSSample,
+        var jsEvent = new WebInspector.TracingModel.Event(WebInspector.TracingModel.DevToolsMetadataEventCategory, WebInspector.TimelineModel.RecordType.JSSample,
             WebInspector.TracingModel.Phase.Instant, timestamps[i], mainThread);
         jsEvent.stackTrace = stackTrace;
         jsEvents.push(jsEvent);
@@ -60,8 +60,8 @@ WebInspector.TimelineJSProfileProcessor.generateJSFrameEvents = function(events)
     function isJSInvocationEvent(e)
     {
         switch (e.name) {
-        case WebInspector.TracingTimelineModel.RecordType.FunctionCall:
-        case WebInspector.TracingTimelineModel.RecordType.EvaluateScript:
+        case WebInspector.TimelineModel.RecordType.FunctionCall:
+        case WebInspector.TimelineModel.RecordType.EvaluateScript:
             return true;
         }
         return false;
@@ -78,7 +78,7 @@ WebInspector.TimelineJSProfileProcessor.generateJSFrameEvents = function(events)
 
     function onInstantEvent(e, top)
     {
-        if (e.name === WebInspector.TracingTimelineModel.RecordType.JSSample && top && !isJSInvocationEvent(top))
+        if (e.name === WebInspector.TimelineModel.RecordType.JSSample && top && !isJSInvocationEvent(top))
             return;
         extractStackTrace(e);
     }
@@ -109,7 +109,7 @@ WebInspector.TimelineJSProfileProcessor.generateJSFrameEvents = function(events)
         jsFramesStack.length = j;
         for (; j < numFrames; ++j) {
             var frame = e.stackTrace[numFrames - 1 - j];
-            var jsFrameEvent = new WebInspector.TracingModel.Event(WebInspector.TracingModel.DevToolsMetadataEventCategory, WebInspector.TracingTimelineModel.RecordType.JSFrame,
+            var jsFrameEvent = new WebInspector.TracingModel.Event(WebInspector.TracingModel.DevToolsMetadataEventCategory, WebInspector.TimelineModel.RecordType.JSFrame,
                 WebInspector.TracingModel.Phase.Complete, e.startTime, e.thread);
             jsFrameEvent.addArgs({ data: frame });
             jsFrameEvent.setEndTime(endTime);