DevTools: Make Timeline tests use only model records

LayoutTests/http/tests/inspector/timeline-test.js

 var initialize_Timeline = function() {
 
 // Scrub values when printing out these properties in the record or data field.
 InspectorTest.timelinePropertyFormatters = {
     children: "formatAsTypeName",
     endTime: "formatAsTypeName",
     requestId: "formatAsTypeName",
     startTime: "formatAsTypeName",
     stackTrace: "formatAsTypeName",
     url: "formatAsURL",
@@ skipping 22 matching lines @@
     return WebInspector.panels.timeline._currentViews[0]._presentationModel;
 }
 
 InspectorTest.timelineModel = function()
 {
     return WebInspector.panels.timeline._model;
 }
 
 InspectorTest.startTimeline = function(callback)
 {
-    InspectorTest._timelineRecords = [];
     var panel = WebInspector.inspectorView.panel("timeline");
     panel.toggleTimelineButton.toggled = true;
     panel._model._collectionEnabled = true;
     panel._userInitiatedRecording = true;
     panel._model._currentTarget = WebInspector.targetManager.mainTarget();
     TimelineAgent.start(5, true, undefined, true, false, callback);
-    function addRecord(record)
-    {
-        InspectorTest._timelineRecords.push(record);
-        for (var i = 0; record.children && i < record.children.length; ++i)
-            addRecord(record.children[i]);
-    }
-    InspectorTest._addTimelineEvent = function(event)
-    {
-        addRecord(event.data);
-    }
-    WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, InspectorTest._addTimelineEvent);
 };
 
 InspectorTest.stopTimeline = function(callback)
 {
     function didStop(error)
     {
         if (error)
             testRunner.logToStderr("error: " + error);
-        WebInspector.timelineManager.removeEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, InspectorTest._addTimelineEvent);
         var panel = WebInspector.inspectorView.panel("timeline");
         panel.toggleTimelineButton.toggled = false;
         panel._userInitiatedRecording = false;
-        callback(InspectorTest._timelineRecords);
+        callback();
     }
     TimelineAgent.stop(didStop);
 };
 
 InspectorTest.evaluateWithTimeline = function(actions, doneCallback)
 {
     InspectorTest.startTimeline(step1);
     function step1()
     {
         InspectorTest.evaluateInPage(actions, step2);
@@ skipping 33 matching lines @@
         InspectorTest.printTimelineRecords(typeName);
         if (includeTimeStamps) {
             InspectorTest.addResult("Timestamp records: ");
             InspectorTest.printTimestampRecords(typeName);
         }
         InspectorTest.completeTest();
     }
     InspectorTest.evaluateWithTimeline(actions, callback);
 };
 
-InspectorTest.filterTimelineRecords = function(typeName, firstOnly)
-{
-    var filteredRecords = [];
-    filterRecords(typeName, InspectorTest._timelineRecords);
-    return filteredRecords;
-
-    function filterRecords(typeName, records)
-    {
-        if (!records)
-            return false;
-        for (var i = 0; i < records.length; ++i) {
-            var recordTypeName = (typeof records[i].type === "string") ? records[i].type : records[i].type();
-            if (typeName && recordTypeName === WebInspector.TimelineModel.RecordType[typeName]) {
-                filteredRecords.push(records[i]);
-                if (firstOnly)
-                    return true;
-            }
-            if (filterRecords(typeName, records[i].children))
-                return true;
-        }
-        return false;
-    }
-}
-
 InspectorTest.printTimelineRecords = function(typeName, formatter)
 {
-    InspectorTest.innerPrintTimelineRecords(InspectorTest._timelineRecords, typeName, formatter);
+    InspectorTest.timelineModel().forAllRecords(InspectorTest._printTimlineRecord.bind(InspectorTest, typeName, formatter));
 };
 
 InspectorTest.printTimelinePresentationRecords = function(typeName, formatter)
 {
     InspectorTest.innerPrintTimelinePresentationRecords(WebInspector.panels.timeline._model.records(), typeName, formatter);
 };
 
 InspectorTest.printTimestampRecords = function(typeName, formatter)
 {
     InspectorTest.innerPrintTimelineRecords(InspectorTest.timelineModel().eventDividerRecords(), typeName, formatter);
 };
 
 InspectorTest.innerPrintTimelineRecords = function(records, typeName, formatter)
 {
-    for (var i = 0; i < records.length; ++i) {
-        var recordTypeName = (typeof records[i].type === "string") ? records[i].type : records[i].type();
-        if (typeName && recordTypeName === WebInspector.TimelineModel.RecordType[typeName])
-            InspectorTest.printTimelineRecordProperties(records[i]);
-        if (formatter)
-            formatter(records[i]);
-    }
+    for (var i = 0; i < records.length; ++i)
+        InspectorTest._printTimlineRecord(typeName, formatter, records[i]);
 };
 
+InspectorTest._printTimlineRecord = function(typeName, formatter, record)
+{
+    if (typeName && record.type() === WebInspector.TimelineModel.RecordType[typeName])
+        InspectorTest.printTimelineRecordProperties(record);
+    if (formatter)
+        formatter(record);
+};
+
+
 InspectorTest.innerPrintTimelinePresentationRecords = function(records, typeName, formatter)
 {
     for (var i = 0; i < records.length; ++i) {
         if (typeName && records[i].type() === WebInspector.TimelineModel.RecordType[typeName])
             InspectorTest.printTimelineRecordProperties(records[i]);
         if (formatter)
             formatter(records[i]);
         InspectorTest.innerPrintTimelinePresentationRecords(records[i].children(), typeName, formatter);
     }
 };
 
 // Dump just the record name, indenting output on separate lines for subrecords
 InspectorTest.dumpTimelineRecord = function(record, detailsCallback, level, filterTypes)
 {
     if (typeof level !== "number")
         level = 0;
     var prefix = "";
     var suffix = "";
     for (var i = 0; i < level ; ++i)
         prefix = "----" + prefix;
     if (level > 0)
         prefix = prefix + "> ";
-    if (record.type === WebInspector.TimelineModel.RecordType.TimeStamp
-        || record.type === WebInspector.TimelineModel.RecordType.ConsoleTime) {
-        suffix = " : " + record.data.message;
+    if (record.type() === WebInspector.TimelineModel.RecordType.TimeStamp
+        || record.type() === WebInspector.TimelineModel.RecordType.ConsoleTime) {
+        suffix = " : " + record.data().message;
     }
     if (detailsCallback)
         suffix += " " + detailsCallback(record);
-    InspectorTest.addResult(prefix + InspectorTest._timelineAgentTypeToString(record.type) + suffix);
+    InspectorTest.addResult(prefix + InspectorTest._timelineAgentTypeToString(record.type()) + suffix);
 
-    var numChildren = record.children ? record.children.length : 0;
+    var children = record.children();
+    var numChildren = children.length;
     for (var i = 0; i < numChildren; ++i) {
-        if (filterTypes && filterTypes.indexOf(record.children[i].type) == -1)
+        if (filterTypes && filterTypes.indexOf(children[i].type()) == -1)
             continue;
-        InspectorTest.dumpTimelineRecord(record.children[i], detailsCallback, level + 1, filterTypes);
+        InspectorTest.dumpTimelineRecord(children[i], detailsCallback, level + 1, filterTypes);
     }
 }
 
 InspectorTest.dumpTimelineModelRecord = function(record, level)
 {
     if (typeof level !== "number")
         level = 0;
     var prefix = "";
     for (var i = 0; i < level ; ++i)
         prefix = "----" + prefix;
@@ skipping 55 matching lines @@
 
 InspectorTest._timelineAgentTypeToString = function(numericType)
 {
     for (var prop in WebInspector.TimelineModel.RecordType) {
         if (WebInspector.TimelineModel.RecordType[prop] === numericType)
             return prop;
     }
     return undefined;
 };
 
-InspectorTest.findPresentationRecord = function(type)
+InspectorTest.findFirstTimelineRecord = function(type)
 {
     var result;
     function findByType(record)
     {
         if (record.type() !== type)
             return false;
         result = record;
         return true;
     }
-    WebInspector.inspectorView.panel("timeline")._model.forAllRecords(findByType);
+    InspectorTest.timelineModel().forAllRecords(findByType);
     return result;
 }
 
 InspectorTest.FakeFileReader = function(input, delegate, callback)
 {
     this._delegate = delegate;
     this._callback = callback;
     this._input = input;
     this._loadedSize = 0;
     this._fileSize = input.length;
@@ skipping 56 matching lines @@
         return this._fileSize;
     },
 
     fileName: function()
     {
         return "fakeFile";
     }
 };
 
 };