Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / inspector / tracing-test.js

diff --git a/src/third_party/WebKit/LayoutTests/inspector/tracing-test.js b/src/third_party/WebKit/LayoutTests/inspector/tracing-test.js
index 78cf3fd..e54453f 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/inspector/tracing-test.js
+++ b/src/third_party/WebKit/LayoutTests/inspector/tracing-test.js
@@ -3,13 +3,17 @@ function initialize_TracingTest()
 
 // FIXME: remove when tracing is out of experimental
 WebInspector.inspectorView.showPanel("timeline");
+InspectorTest.tracingManager = WebInspector.panels.timeline._tracingManager || new WebInspector.TracingManager();
 InspectorTest.tracingModel = new WebInspector.TracingModel();
-InspectorTest.tracingTimelineModel = new WebInspector.TracingTimelineModel(InspectorTest.tracingModel);
+InspectorTest.tracingTimelineModel = new WebInspector.TracingTimelineModel(InspectorTest.tracingManager, InspectorTest.tracingModel, new WebInspector.TimelineRecordHiddenTypeFilter([]));
 
-InspectorTest.invokeWithTracing = function(categoryFilter, functionName, callback)
+InspectorTest.invokeWithTracing = function(functionName, callback, additionalCategories)
 {
     InspectorTest.tracingTimelineModel.addEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onTracingStarted, this);
-    InspectorTest.tracingTimelineModel._startRecordingWithCategories(categoryFilter);
+    var categories = "-*,disabled-by-default-devtools.timeline*";
+    if (additionalCategories)
+        categories += "," + additionalCategories;
+    InspectorTest.tracingTimelineModel._startRecordingWithCategories(categories);
 
     function onTracingStarted(event)
     {