Move timeline and importers to use telemetry.value.TraceValue

tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py

Index: tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py
index 1fdcdd483a776ef3c0809fc0d74e00616d219c25..9be448328572b193f41f6715319a32baf83c0b8a 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py
@@ -8,9 +8,9 @@ import logging
 import unittest
 
 from telemetry.core import util
-from telemetry.timeline import tracing_timeline_data
-from telemetry.timeline.model import TimelineModel
+from telemetry.timeline import model as model_module
 from telemetry.unittest import tab_test_case
+from telemetry.value import trace as trace_value_module
 
 
 class TracingBackendTest(tab_test_case.TabTestCase):
@@ -29,59 +29,7 @@ class TracingBackendTest(tab_test_case.TabTestCase):
       return
     self._StartServer()
     self._browser.StartTracing()
-    self._browser.StopTracing()
+    value = self._browser.StopTracing()
 
-    # TODO(tengs): check model for correctness after trace_event_importer
-    # is implemented (crbug.com/173327).
-
-
-class ChromeTraceResultTest(unittest.TestCase):
-  def __init__(self, method_name):
-    super(ChromeTraceResultTest, self).__init__(method_name)
-
-  def testWrite1(self):
-    ri = tracing_timeline_data.TracingTimelineData(map(json.loads, []))
-    f = cStringIO.StringIO()
-    ri.Serialize(f)
-    v = f.getvalue()
-
-    j = json.loads(v)
-    assert 'traceEvents' in j
-    self.assertEquals(j['traceEvents'], [])
-
-  def testWrite2(self):
-    ri = tracing_timeline_data.TracingTimelineData(map(json.loads, [
-        '"foo"',
-        '"bar"']))
-    f = cStringIO.StringIO()
-    ri.Serialize(f)
-    v = f.getvalue()
-
-    j = json.loads(v)
-    assert 'traceEvents' in j
-    self.assertEquals(j['traceEvents'], ['foo', 'bar'])
-
-  def testWrite3(self):
-    ri = tracing_timeline_data.TracingTimelineData(map(json.loads, [
-        '"foo"',
-        '"bar"',
-        '"baz"']))
-    f = cStringIO.StringIO()
-    ri.Serialize(f)
-    v = f.getvalue()
-
-    j = json.loads(v)
-    assert 'traceEvents' in j
-    self.assertEquals(j['traceEvents'],
-                      ['foo', 'bar', 'baz'])
-
-  def testBrowserProcess(self):
-    ri = tracing_timeline_data.TracingTimelineData(map(json.loads, [
-        '{"name": "process_name",'
-        '"args": {"name": "Browser"},'
-        '"pid": 5, "ph": "M"}',
-        '{"name": "thread_name",'
-        '"args": {"name": "CrBrowserMain"},'
-        '"pid": 5, "tid": 32578, "ph": "M"}']))
-    model = TimelineModel(ri)
-    self.assertEquals(model.browser_process.pid, 5)
+    model = model_module.Model(value)
+    assert len(model.processes) > 0