Set tracing categories explicitly in Clovis and Sandwich

tools/android/loading/activity_lens_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 unittest
 
 from activity_lens import (ActivityLens, _EventsTree)
+import clovis_constants
 import test_utils
 import tracing
 
 
 class ActivityLensTestCase(unittest.TestCase):
   @classmethod
   def _EventsFromRawEvents(cls, raw_events):
-    tracing_track = tracing.TracingTrack(None)
+    tracing_track = tracing.TracingTrack(None,
+        clovis_constants.DEFAULT_CATEGORIES)
     tracing_track.Handle(
         'Tracing.dataCollected', {'params': {'value': raw_events}})
     return tracing_track.GetEvents()
 
   def setUp(self):
-    self.tracing_track = tracing.TracingTrack(None)
+    self.tracing_track = tracing.TracingTrack(None,
+        clovis_constants.DEFAULT_CATEGORIES)
 
   def testGetRendererMainThread(self):
     first_renderer_tid = 12345
     second_renderer_tid = 123456
     raw_events =  [
         {u'args': {u'name': u'CrBrowserMain'},
          u'cat': u'__metadata',
          u'name': u'thread_name',
          u'ph': u'M',
          u'pid': 1,
@@ skipping 302 matching lines @@
         [self._ROOT_EVENT], self.tree.DominatingEventsWithNames(('-1')))
     self.assertListEqual(
         [self._ROOT_EVENT], self.tree.DominatingEventsWithNames(('-1', '0')))
     self.assertListEqual(
         [self._EVENTS[1], self._EVENTS[5]],
         self.tree.DominatingEventsWithNames(('1', '5')))
 
 
 if __name__ == '__main__':
   unittest.main()