Set tracing categories explicitly in Clovis and Sandwich

tools/android/loading/sandwich_metrics_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 copy
 import json
 import os
 import shutil
 import subprocess
 import tempfile
@@ skipping 35 matching lines @@
     {'cat': _MEM_CAT,   'name': 'periodic_interval', 'pid': 1, 'ph': 'v',
         'ts': 1, 'args': {'dumps': {'allocators': {'malloc': {'attrs': {'size':{
             'units': 'bytes', 'value': 'd704', }}}}}}},
     {'ph': 'M', 'cat': '__metadata', 'pid': 1, 'name': 'process_name', 'ts': 1,
         'args': {'name': 'Browser'}}]
 
 
 def TracingTrack(events):
   return tracing.TracingTrack.FromJsonDict({
       'events': events,
-      'categories': (tracing.INITIAL_CATEGORIES +
-          (sandwich_runner.MEMORY_DUMP_CATEGORY,))})
+      'categories': (sandwich_runner._TRACING_CATEGORIES +
+          [sandwich_runner.MEMORY_DUMP_CATEGORY])})
 
 
 def LoadingTrace(events):
   return loading_trace.LoadingTrace('http://a.com/', {},
                                     page_track.PageTrack(None),
                                     request_track.RequestTrack(None),
                                     TracingTrack(events))
 
 
 class PageTrackTest(unittest.TestCase):
@@ skipping 181 matching lines @@
       point(200, 0.6),
       point(150, 0.3),
       point(230, 1.0),
     ]
     with self.assertRaises(ValueError):
       puller._ComputeSpeedIndex(completness_record)
 
 
 if __name__ == '__main__':
   unittest.main()