[telemetry] Timeline model cleanups

tools/telemetry/telemetry/core/timeline/sample.py

Index: tools/telemetry/telemetry/core/timeline/sample.py
diff --git a/tools/telemetry/telemetry/core/timeline/tracing/sample.py b/tools/telemetry/telemetry/core/timeline/sample.py
similarity index 77%
rename from tools/telemetry/telemetry/core/timeline/tracing/sample.py
rename to tools/telemetry/telemetry/core/timeline/sample.py
index 5f7f672d9d478593812a5da16b9c9df1b3d54550..36a3ab45b43c70b002bf24d14b154d4f5d33bfe3 100644
--- a/tools/telemetry/telemetry/core/timeline/tracing/sample.py
+++ b/tools/telemetry/telemetry/core/timeline/sample.py
@@ -13,7 +13,7 @@ class Sample(timeline_event.TimelineEvent):
 
   All time units are stored in milliseconds.
   '''
-  def __init__(self, category, name, timestamp, args=None, parent=None):
+  def __init__(self, parent_thread, category, name, timestamp, args=None):
     super(Sample, self).__init__(
-        name, timestamp, 0, args=args, parent=parent)
-    self.category = category
+        category, name, timestamp, 0, args=args)
+    self.parent_thread = parent_thread