Set tracing categories explicitly in Clovis and Sandwich

tools/android/loading/test_utils.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.
 
 """Common utilities used in unit tests, within this directory."""
 
+import clovis_constants
 import dependency_graph
 import devtools_monitor
 import loading_trace
 import page_track
 import request_track
 import tracing
 import user_satisfied_lens
 
 
 class FakeRequestTrack(devtools_monitor.Track):
@@ skipping 116 matching lines @@
       'requestTime': start_time / 1000.0}
   return MakeRequestWithTiming(
       url, source_url, timing_dict, magic_content_type, initiator_type)
 
 
 def LoadingTraceFromEvents(requests, page_events=None, trace_events=None):
   """Returns a LoadingTrace instance from various events."""
   request = FakeRequestTrack(requests)
   page_event_track = FakePageTrack(page_events if page_events else [])
   if trace_events is not None:
-    tracing_track = tracing.TracingTrack(None)
+    tracing_track = tracing.TracingTrack(None,
+        clovis_constants.DEFAULT_CATEGORIES)
     tracing_track.Handle('Tracing.dataCollected',
                          {'params': {'value': [e for e in trace_events]}})
   else:
     tracing_track = None
   return loading_trace.LoadingTrace(
       None, None, page_event_track, request, tracing_track)
 
 
 class SimpleLens(object):
   """A simple replacement for RequestDependencyLens.
@@ skipping 92 matching lines @@
     self._request_index += 1
     return rq
 
   def CreateTrace(self, requests, events, main_frame_id):
     page_event = {'method': 'Page.frameStartedLoading',
                   'frame_id': main_frame_id}
     trace = LoadingTraceFromEvents(
         requests, trace_events=events, page_events=[page_event])
     trace.tracing_track.SetMainFrameID(main_frame_id)
     return trace