Revert of Revert "[Clock sync] Use clock sync manager to convert trace event timestamps"

tracing/tracing/extras/importer/trace_event_importer_test.html

Index: tracing/tracing/extras/importer/trace_event_importer_test.html
diff --git a/tracing/tracing/extras/importer/trace_event_importer_test.html b/tracing/tracing/extras/importer/trace_event_importer_test.html
index 9c7c1b1d8ebdaffe99d9a19b614b0ab0f868e172..d9a607374c976db3a08cfe8bc41d0d9e95b30e17 100644
--- a/tracing/tracing/extras/importer/trace_event_importer_test.html
+++ b/tracing/tracing/extras/importer/trace_event_importer_test.html
@@ -8,6 +8,7 @@ found in the LICENSE file.
 <link rel="import" href="/tracing/base/time_display_modes.html">
 <link rel="import" href="/tracing/base/unit.html">
 <link rel="import" href="/tracing/core/test_utils.html">
+<link rel="import" href="/tracing/extras/importer/battor_importer.html">
 <link rel="import" href="/tracing/extras/importer/trace_event_importer.html">
 <link rel="import" href="/tracing/extras/measure/measure.html">
 <link rel="import" href="/tracing/importer/import.html">
@@ -5274,8 +5275,7 @@ tr.b.unittest.testSuite(function() {
       ],
       powerTraceAsString: battorLog
     };
-
-    var m = makeModel(eventData);
+    var m = new tr.Model();
     var importer = new tr.e.importer.TraceEventImporter(m, eventData);
     var subTraces = importer.extractSubtraces();
     assert.isTrue(subTraces instanceof Array);