Added test that SurfaceFlinger metrics are calculated on android

tools/perf/metrics/speedindex_unittest.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # These tests access private methods in the speedindex module.
 # pylint: disable=W0212
 
 import json
 import os
 import unittest
 
 from telemetry.image_processing import histogram
 from telemetry.image_processing import rgba_color
-from telemetry.timeline import inspector_timeline_data
 from telemetry.timeline import model
+from telemetry.timeline import trace_data as trace_data_module
 from metrics import speedindex
 
 # Sample timeline data in the json format provided by devtools.
 # The sample events will be used in several tests below.
 _TEST_DIR = os.path.join(os.path.dirname(__file__), 'unittest_data')
 _SAMPLE_DATA = json.load(open(os.path.join(_TEST_DIR, 'sample_timeline.json')))
-_SAMPLE_TIMELINE_DATA = inspector_timeline_data.InspectorTimelineData(
-    _SAMPLE_DATA)
+_SAMPLE_TRACE_BUILDER = trace_data_module.TraceDataBuilder()
+_SAMPLE_TRACE_BUILDER.AddEventsTo(
+    trace_data_module.INSPECTOR_TRACE_PART, _SAMPLE_DATA)
 _SAMPLE_EVENTS = model.TimelineModel(
-    timeline_data=_SAMPLE_TIMELINE_DATA).GetAllEvents()
+    _SAMPLE_TRACE_BUILDER.AsData()).GetAllEvents()
 
 
 class FakeImageUtil(object):
   # pylint: disable=W0613
   def GetColorHistogram(self, image, ignore_color=None, tolerance=None):
     return image.ColorHistogram()
 
 class FakeTimelineModel(object):
   def __init__(self):
     self._events = []
@@ skipping 161 matching lines @@
 
     Args:
       filename: Filename of a json file which contains a
       expected: The result expected based on the WPT result.
     """
     tab = FakeTab()
     impl = speedindex.PaintRectSpeedIndexImpl()
     file_path = os.path.join(_TEST_DIR, filename)
     with open(file_path) as json_file:
       raw_events = json.load(json_file)
-      timeline_data = inspector_timeline_data.InspectorTimelineData(raw_events)
+      trace_data_builder = trace_data_module.TraceDataBuilder()
+      trace_data_builder.AddEventsTo(
+          trace_data_module.INSPECTOR_TRACE_PART, raw_events)
       tab.timeline_model.SetAllEvents(
-          model.TimelineModel(timeline_data=timeline_data).GetAllEvents())
+          model.TimelineModel(trace_data_builder.AsData()).GetAllEvents())
       tab.SetEvaluateJavaScriptResult(viewport)
       actual = impl.CalculateSpeedIndex(tab)
       # The result might differ by 1 or more milliseconds due to rounding,
       # so compare to the nearest 10 milliseconds.
       self.assertAlmostEqual(actual, expected, places=-1)
 
   def testCern(self):
     # Page: http://info.cern.ch/hypertext/WWW/TheProject.html
     # This page has only one paint event.
     self._TestJsonTimelineExpectation(
         'cern_repeat_timeline.json', (1014, 650), 379.0)
 
   def testBaidu(self):
     # Page: http://www.baidu.com/
     # This page has several paint events, but no nested paint events.
     self._TestJsonTimelineExpectation(
         'baidu_repeat_timeline.json', (1014, 650), 1761.43)
 
   def test2ch(self):
     # Page: http://2ch.net/
     # This page has several paint events, including nested paint events.
     self._TestJsonTimelineExpectation(
         '2ch_repeat_timeline.json', (997, 650), 674.58)
 
 
 if __name__ == "__main__":
   unittest.main()