Added test that SurfaceFlinger metrics are calculated on android

tools/telemetry/telemetry/timeline/inspector_importer_unittest.py

Index: tools/telemetry/telemetry/timeline/inspector_importer_unittest.py
diff --git a/tools/telemetry/telemetry/timeline/inspector_importer_unittest.py b/tools/telemetry/telemetry/timeline/inspector_importer_unittest.py
index 8728fc4d90595df8e0cdaf875d978f72846a1258..fc379d1abc5e9e136d5bffeae68f2d6c601d7d55 100644
--- a/tools/telemetry/telemetry/timeline/inspector_importer_unittest.py
+++ b/tools/telemetry/telemetry/timeline/inspector_importer_unittest.py
@@ -4,8 +4,8 @@
 import unittest
 
 from telemetry.timeline import inspector_importer
-from telemetry.timeline import inspector_timeline_data
 from telemetry.timeline import model
+from telemetry.timeline import trace_data
 
 _BACKGROUND_MESSAGE = {
   'data': {},
@@ -110,7 +110,9 @@ class InspectorEventParsingTest(unittest.TestCase):
     self.assertEquals(1, event.end)
 
   def testOutOfOrderData(self):
-    raw_event = {
+    builder = trace_data.TraceDataBuilder()
+    builder.AddEventsTo(
+      trace_data.INSPECTOR_TRACE_PART, [{
       'startTime': 5295.004, 'endTime': 5305.004,
       'data': {}, 'type': 'Program',
       'children': [
@@ -124,16 +126,15 @@ class InspectorEventParsingTest(unittest.TestCase):
         {'startTime': 5301.004, 'endTime': 5305.004, 'data': {},
          'type': 'CompositeLayers', 'children': []},
         {'startTime': 5305.004, 'data': {}, 'type': 'MarkFirstPaint'}
-    ]}
-    timeline_data = inspector_timeline_data.InspectorTimelineData([raw_event])
-    model.TimelineModel(timeline_data=timeline_data, shift_world_to_zero=False)
+    ]}])
+    model.TimelineModel(builder.AsData(), shift_world_to_zero=False)
 
 class InspectorImporterTest(unittest.TestCase):
   def testImport(self):
-    messages = [_BACKGROUND_MESSAGE, _SAMPLE_MESSAGE]
-    timeline_data = inspector_timeline_data.InspectorTimelineData(messages)
-    m = model.TimelineModel(timeline_data=timeline_data,
-                            shift_world_to_zero=False)
+    builder = trace_data.TraceDataBuilder()
+    builder.AddEventsTo(trace_data.INSPECTOR_TRACE_PART,
+                        [_BACKGROUND_MESSAGE, _SAMPLE_MESSAGE])
+    m = model.TimelineModel(builder.AsData(), shift_world_to_zero=False)
     self.assertEquals(1, len(m.processes))
     process = m.processes.values()[0]
     threads = process.threads