Set tracing categories explicitly in Clovis and Sandwich

tools/android/loading/analyze.py

 #! /usr/bin/python
 # Copyright 2015 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 argparse
 import cgi
 import json
 import logging
 import os
 import subprocess
 import sys
 import tempfile
 import time
 
 _SRC_DIR = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', '..'))
 
 sys.path.append(os.path.join(_SRC_DIR, 'third_party', 'catapult', 'devil'))
 from devil.android import device_utils
 from devil.android.sdk import intent
 
 sys.path.append(os.path.join(_SRC_DIR, 'build', 'android'))
 import devil_chromium
 from pylib import constants
 
 import activity_lens
+import clovis_constants
 import content_classification_lens
 import controller
 import device_setup
 import frame_load_lens
 import loading_graph_view
 import loading_graph_view_visualization
 import loading_trace
 import options
 import request_dependencies_lens
 import request_track
@@ skipping 76 matching lines @@
                  else OPTIONS.clear_cache)
   if OPTIONS.emulate_device:
     chrome_ctl.SetDeviceEmulation(OPTIONS.emulate_device)
   if OPTIONS.emulate_network:
     chrome_ctl.SetNetworkEmulation(OPTIONS.emulate_network)
   try:
     with chrome_ctl.Open() as connection:
       if clear_cache:
         connection.ClearCache()
       trace = loading_trace.LoadingTrace.RecordUrlNavigation(
-          url, connection, chrome_ctl.ChromeMetadata())
+          url, connection, chrome_ctl.ChromeMetadata(),
+          categories=clovis_constants.DEFAULT_CATEGORIES)
   except controller.ChromeControllerError as e:
     e.Dump(sys.stderr)
     raise
 
   if xvfb_process:
     xvfb_process.terminate()
 
   return trace.ToJsonDict()
 
 
@@ skipping 193 matching lines @@
   parser.add_argument('command', help=' '.join(COMMAND_MAP.keys()))
   parser.add_argument('rest', nargs=argparse.REMAINDER)
   args = parser.parse_args()
   devil_chromium.Initialize()
   COMMAND_MAP.get(args.command,
                   lambda _: InvalidCommand(args.command))(args.rest)
 
 
 if __name__ == '__main__':
   main()