Clovis: contentful paint upgrades.

tools/android/loading/tracing_unittest.py

 # Copyright 2016 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 collections
 import copy
 import logging
 import operator
 import unittest
 
@@ skipping 291 matching lines @@
         {'ts': 7, 'ph': 'X', 'dur': 10, 'pid': 2, 'tid': 1, 'id': '0x123',
          'name': 'navigationStart', 'cat': 'blink.user_timing',
          'args': {'frame': _SUBFRAME_ID}},
         {'ts': 8, 'ph': 'X', 'dur': 2, 'pid': 2, 'tid': 1, 'id': '0x12343',
         'name': 'A'},
         {'ts': 3, 'ph': 'X', 'dur': 10, 'pid': 2, 'tid': 1, 'id': '0x125',
          'name': 'navigationStart', 'cat': 'blink.user_timing',
          'args': {'frame': _MAIN_FRAME_ID}},
         ]
     self._HandleEvents(events)
-    self.assertEquals(_MAIN_FRAME_ID, self.track._GetMainFrameID())
+    self.assertEquals(_MAIN_FRAME_ID, self.track.GetMainFrameID())
 
   def testGetMatchingEvents(self):
     _MAIN_FRAME_ID = 0xffff
     _SUBFRAME_ID = 0xaaaa
     events = [
         {'ts': 7, 'ph': 'X', 'dur': 10, 'pid': 2, 'tid': 1, 'id': '0x123',
          'name': 'navigationStart', 'cat': 'blink.user_timing',
          'args': {'frame': _SUBFRAME_ID}},
         {'ts': 8, 'ph': 'X', 'dur': 2, 'pid': 2, 'tid': 1, 'id': '0x12343',
         'name': 'A'},
@@ skipping 126 matching lines @@
                    'cat': 'bar,baz,bizbiz',
                    'ph': 'X',
                    'ts': 0, 'dur': 0})
     self.assertTrue(event.Matches('bar', 'foo'))
     self.assertTrue(event.Matches('baz', 'foo'))
     self.assertFalse(event.Matches('bar', 'biz'))
     self.assertFalse(event.Matches('biz', 'foo'))
 
 if __name__ == '__main__':
   unittest.main()