[android] Clean up test_runner.py arguments.

build/android/pylib/local/device/local_device_environment.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 datetime
 import functools
 import logging
 import os
 import shutil
 import tempfile
 import threading
 
+import devil_chromium
 from devil import base_error
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_list
 from devil.android import device_utils
 from devil.android import logcat_monitor
 from devil.utils import file_utils
 from devil.utils import parallelizer
 from pylib import constants
 from pylib.base import environment
@@ skipping 64 matching lines @@
     self._enable_device_cache = args.enable_device_cache
     self._logcat_monitors = []
     self._logcat_output_dir = args.logcat_output_dir
     self._logcat_output_file = args.logcat_output_file
     self._max_tries = 1 + args.num_retries
     self._skip_clear_data = args.skip_clear_data
     self._target_devices_file = args.target_devices_file
     self._tool_name = args.tool
     self._trace_output = args.trace_output
 
+    devil_chromium.Initialize(
+        output_directory=constants.GetOutDirectory(),
+        adb_path=args.adb_path)
+
+    # Some things such as Forwarder require ADB to be in the environment path.
+    adb_dir = os.path.dirname(constants.GetAdbPath())

[mikecase (-- gone --), 2017/03/14 16:02:44]

You have a TODO to remove existing callers of constants.GetAdbPath(). So you
should probably instead call AdbWrapper.GetAdbPath()

[jbudorick, 2017/03/14 20:00:37]

Good call. Done.

+    if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):
+      os.environ['PATH'] = adb_dir + os.pathsep + os.environ['PATH']
+
   #override
   def SetUp(self):
     if self.trace_output:
       self.EnableTracing()
 
   def _InitDevices(self):
     device_arg = 'default'
     if self._target_devices_file:
       device_arg = device_list.GetPersistentDeviceList(
           self._target_devices_file)
@@ skipping 150 matching lines @@
     else:
       trace_event.trace_disable()
     self._JsonToTrace(self._trace_output + '.json',
                       self._trace_output)
 
   def EnableTracing(self):
     if trace_event.trace_is_enabled():
       logging.warning('Tracing is already running.')
     else:
       trace_event.trace_enable(self._trace_output + '.json')