Enable some profile_chrome unit tests on Trybots

systrace/profile_chrome/chrome_tracing_agent.py

 # Copyright 2014 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 json
 import optparse
 import os
 import py_utils
 import re
+from profile_chrome import util
 
 from devil.android import device_errors
 from devil.android.sdk import intent
-
 from systrace import trace_result
 from systrace import tracing_agents
 
 
 _DEFAULT_CHROME_CATEGORIES = '_DEFAULT_CHROME_CATEGORIES'
 _HEAP_PROFILE_MMAP_PROPERTY = 'heapprof.mmap'
 
 
 class ChromeTracingAgent(tracing_agents.TracingAgent):
   def __init__(self, device, package_info, ring_buffer, trace_memory=False):
     tracing_agents.TracingAgent.__init__(self)
     self._device = device
     self._package_info = package_info
     self._ring_buffer = ring_buffer
     self._logcat_monitor = self._device.GetLogcatMonitor()
     self._trace_file = None
     self._trace_memory = trace_memory
     self._is_tracing = False
     self._trace_start_re = \
        re.compile(r'Logging performance trace to file')
     self._trace_finish_re = \
        re.compile(r'Profiler finished[.] Results are in (.*)[.]')
     self._categories = None
 
   def __repr__(self):
     return 'chrome trace'
 
   @staticmethod
   def GetCategories(device, package_info):
+    curr_browser = util.GetChromeProcessID(device, package_info)

[Sami, 2016/09/09 10:28:25]

I don't think the agents should be trying to start the browser. That is the
responsibility of the caller (i.e., test harness in this case).

[washingtonp, 2016/09/09 18:07:29]

Done.

+    if curr_browser == None:
+      util.StartBrowser(device, package_info)
     with device.GetLogcatMonitor() as logmon:
       device.BroadcastIntent(intent.Intent(
           action='%s.GPU_PROFILER_LIST_CATEGORIES' % package_info.package))
       try:
         json_category_list = logmon.WaitFor(
             re.compile(r'{"traceCategoriesList(.*)'), timeout=5).group(0)
       except device_errors.CommandTimeoutError:
         raise RuntimeError('Performance trace category list marker not found. '
                            'Is the correct version of the browser running?')
 
     record_categories = set()
     disabled_by_default_categories = set()
     json_data = json.loads(json_category_list)['traceCategoriesList']
     for item in json_data:
       for category in item.split(','):
         if category.startswith('disabled-by-default'):
           disabled_by_default_categories.add(category)
         else:
           record_categories.add(category)
 
     return list(record_categories), list(disabled_by_default_categories)
 
   @py_utils.Timeout(tracing_agents.START_STOP_TIMEOUT)
   def StartAgentTracing(self, config, timeout=None):
+    curr_browser = util.GetChromeProcessID(self._device, self._package_info)
+    if curr_browser == None:
+      util.StartBrowser(self._device, self._package_info)
     self._categories = _ComputeChromeCategories(config)
     self._logcat_monitor.Start()
     start_extras = {'categories': ','.join(self._categories)}
     if self._ring_buffer:
       start_extras['continuous'] = None
     self._device.BroadcastIntent(intent.Intent(
         action='%s.GPU_PROFILER_START' % self._package_info.package,
         extras=start_extras))
 
     if self._trace_memory:
@@ skipping 116 matching lines @@
     categories.append('disabled-by-default-toplevel.flow')
   if config.trace_memory:
     categories.append('disabled-by-default-memory')
   if config.trace_scheduler:
     categories.append('disabled-by-default-blink.scheduler')
     categories.append('disabled-by-default-cc.debug.scheduler')
     categories.append('disabled-by-default-renderer.scheduler')
   if config.chrome_categories:
     categories += config.chrome_categories.split(',')
   return categories