Set tracing categories explicitly in Clovis and Sandwich

tools/android/loading/trace_test/webserver_test.py

 #! /usr/bin/python
 # 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.
 
 """An integration test for tracing.
 
 This is not run as part of unittests and is executed directly. In normal
 operation it can be run with no arguments (or perhaps --no_sandbox depending on
 how you have chrome set up). When debugging or adding tests, setting
@@ skipping 23 matching lines @@
 import json
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 import urlparse
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
+import clovis_constants
 import controller
 import loading_trace
 import options
 
 
 OPTIONS = options.OPTIONS
 WEBSERVER = os.path.join(os.path.dirname(__file__), 'test_server.py')
 TESTDIR = os.path.join(os.path.dirname(__file__), 'tests')
 RESULTDIR = os.path.join(os.path.dirname(__file__), 'results')
 
@@ skipping 173 matching lines @@
     True if the test passed and false otherwise. Status is printed to stdout.
   """
   url = 'http://%s/%s' % (webserver.Address(), test_page)
   sys.stdout.write('Testing %s...' % url)
   chrome_controller = controller.LocalChromeController()
 
   with chrome_controller.Open() as connection:
     connection.ClearCache()
     observed_seq = InitiatorSequence(
         loading_trace.LoadingTrace.RecordUrlNavigation(
-            url, connection, chrome_controller.ChromeMetadata()))
+            url, connection, chrome_controller.ChromeMetadata(),
+            categories=clovis_constants.DEFAULT_CATEGORIES))
   if observed_seq == expected:
     sys.stdout.write(' ok\n')
     return True
   else:
     sys.stdout.write(' FAILED!\n')
     if OPTIONS.failed_trace_dir:
       outname = os.path.join(OPTIONS.failed_trace_dir,
                              test_page + '.observed_result')
       with file(outname, 'w') as output:
         observed_seq.DumpToFile(output)
@@ skipping 32 matching lines @@
     print 'all tests passed'
 
 
 if __name__ == '__main__':
   OPTIONS.ParseArgs(sys.argv[1:],
                     description='Run webserver integration test',
                     extra=[('--failed_trace_dir', ''),
                            ('--noisy', False),
                            ('--test_filter', None)])
   RunAllTests()