[Systrace] Fix systrace clock syncing issue with BattOr.

systrace/profile_chrome/profiler_unittest.py

 # Copyright 2014 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.
 
+import json
 import os
 import unittest
-import zipfile
 
 from profile_chrome import profiler
 from profile_chrome import ui
 from profile_chrome import fake_agent_1
 from profile_chrome import fake_agent_2
 from systrace import decorators
 from systrace import tracing_controller
 
 
 class ProfilerTest(unittest.TestCase):
@@ skipping 12 matching lines @@
     finally:
       if os.path.exists(result):
         os.remove(result)
 
   @decorators.ClientOnlyTest
   def testCaptureJsonProfile(self):
     result = profiler.CaptureProfile(self._tracing_options, 1,
                                      [fake_agent_2], write_json=True)
 
     try:
-      self.assertFalse(result.endswith('.html'))
+      self.assertTrue(result.endswith('.json'))
       with open(result) as f:
-        self.assertEquals(f.read(), 'fake-contents')
+        trace_data = json.load(f)
+        self.assertListEqual(trace_data['cpuSnapshots'], ['fake-contents'])
     finally:
       if os.path.exists(result):
         os.remove(result)
 
   @decorators.ClientOnlyTest
   def testCaptureMultipleProfiles(self):
     result = profiler.CaptureProfile(self._tracing_options, 1,
                                      [fake_agent_1, fake_agent_2],
                                      write_json=True)
 
     try:
-      self.assertTrue(result.endswith('.zip'))
-      self.assertTrue(zipfile.is_zipfile(result))
+      self.assertTrue(result.endswith('.json'))
+      with open(result, 'r') as fp:
+        json.load(fp)
     finally:
       if os.path.exists(result):
         os.remove(result)