Set tracing categories explicitly in Clovis and Sandwich

tools/android/loading/loading_trace.py

 # Copyright (c) 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.
 
 """Represents the trace of a page load."""
 
 import datetime
 import json
 import time
 
@@ skipping 58 matching lines @@
                         page, request, tracing_track)
 
   @classmethod
   def FromJsonFile(cls, json_path):
     """Returns an instance from a json file saved by ToJsonFile()."""
     with open(json_path) as input_file:
       return cls.FromJsonDict(json.load(input_file))
 
   @classmethod
   def RecordUrlNavigation(
-      cls, url, connection, chrome_metadata, additional_categories=None,
+      cls, url, connection, chrome_metadata, categories,
       timeout_seconds=devtools_monitor.DEFAULT_TIMEOUT_SECONDS):
     """Create a loading trace by using controller to fetch url.
 
     Args:
       url: (str) url to fetch.
       connection: An opened devtools connection.
       chrome_metadata: Dictionary of chrome metadata.
-      additional_categories: ([str] or None) TracingTrack additional categories
-                             to capture.
+      categories: as in tracing.TracingTrack
       timeout_seconds: monitoring connection timeout in seconds.
 
     Returns:
       LoadingTrace instance.
     """
     page = page_track.PageTrack(connection)
     request = request_track.RequestTrack(connection)
-    trace = tracing.TracingTrack(
-        connection,
-        additional_categories=additional_categories)
+    trace = tracing.TracingTrack(connection, categories)
     start_date_str = datetime.datetime.utcnow().isoformat()
     seconds_since_epoch=time.time()
     connection.MonitorUrl(url, timeout_seconds=timeout_seconds)
     trace = cls(url, chrome_metadata, page, request, trace)
     trace.metadata.update(date=start_date_str,
                           seconds_since_epoch=seconds_since_epoch)
     return trace
 
   @property
   def tracing_track(self):
     if not self._tracing_track:
       self._RestoreTracingTrack()
     return self._tracing_track
 
   def Slim(self):
     """Slims the memory usage of a trace by dropping the TraceEvents from it.
 
     The tracing track is restored on-demand when accessed.
     """
     self._tracing_json_str = json.dumps(self._tracing_track.ToJsonDict())
     self._tracing_track = None
 
   def _RestoreTracingTrack(self):
     if not self._tracing_json_str:
       return None
     self._tracing_track = tracing.TracingTrack.FromJsonDict(
         json.loads(self._tracing_json_str))
     self._tracing_json_str = None