Enable new device monitor everywhere and launch it earlier in the build.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 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 contextlib
 import datetime
 import json
 import os
 import pipes
 import re
@@ skipping 304 matching lines @@
         'spawn_logcat_monitor',
         [self.package_repo_resource('scripts', 'slave', 'daemonizer.py'),
          '--', self.c.cr_build_android.join('adb_logcat_monitor.py'),
          self.m.chromium.c.build_dir.join('logcat'),
          self.m.adb.adb_path()],
         env=self.m.chromium.get_env(),
         infra_step=True)
 
   def spawn_device_monitor(self):
     script = self.package_repo_resource('scripts', 'slave', 'daemonizer.py')
-    # TODO(bpastene) Enable everywhere.
-    if self.m.properties.get('buildername') == 'Android Tests (trial)(dbg)':
-      args = [
-          '--action', 'restart',
-          '--pid-file-path', '/tmp/device_monitor.pid', '--',
-          self.m.path['checkout'].join('third_party', 'catapult', 'devil',
-                                       'devil', 'android', 'tools',
-                                       'device_monitor.py'),
-          '--adb-path', self.m.adb.adb_path(),
-          '--blacklist-file', self.blacklist_file
-      ]
-    else:
-      args = [
-          '--action', 'restart',
-          '--pid-file-path', '/tmp/device_monitor.pid',
-          '--', self.resource('spawn_device_monitor.py'),
-          self.m.adb.adb_path(),
-          json.dumps(self._devices),
-          '--blacklist-file', self.blacklist_file
-      ]
+    args = [
+        '--action', 'restart',
+        '--pid-file-path', '/tmp/device_monitor.pid', '--',
+        self.m.path['checkout'].join('third_party', 'catapult', 'devil',
+                                     'devil', 'android', 'tools',
+                                     'device_monitor.py'),
+        '--adb-path', self.m.adb.adb_path(),
+        '--blacklist-file', self.blacklist_file
+    ]
     self.m.python('spawn_device_monitor', script, args, infra_step=True)
 
   def shutdown_device_monitor(self):
     script = self.package_repo_resource('scripts', 'slave', 'daemonizer.py')
     args = [
         '--action', 'stop',
         '--pid-file-path', '/tmp/device_monitor.pid',
     ]
     self.m.python('shutdown_device_monitor', script, args, infra_step=True)
 
@@ skipping 734 matching lines @@
          args=[self.m.path['checkout'].join('out',
                                             self.m.chromium.c.BUILD_CONFIG,
                                             'test_logs',
                                             '*.log')],
     )
 
   def common_tests_setup_steps(self, perf_setup=False,
                                remove_system_webview=False, skip_wipe=False):
     self.create_adb_symlink()
     self.spawn_logcat_monitor()
+    self.spawn_device_monitor()
     self.authorize_adb_devices()
     # TODO(jbudorick): Restart USB only on perf bots while we
     # figure out the fate of the usb reset in general.
     self.device_recovery(restart_usb=perf_setup)
     if perf_setup:
       kwargs = {
           'min_battery_level': 95,
           'disable_network': True,
           'disable_java_debug': True,
           'max_battery_temp': 350}
     else:
       kwargs = {}
     if skip_wipe:
       kwargs['skip_wipe'] = True
     self.provision_devices(remove_system_webview=remove_system_webview,
                            **kwargs)
     self.device_status()
     if self.m.chromium.c.gyp_env.GYP_DEFINES.get('asan', 0) == 1:
       self.asan_device_setup()
 
-    self.spawn_device_monitor()
-
   def common_tests_final_steps(self, logcat_gs_bucket='chromium-android'):
     self.shutdown_device_monitor()
     self.logcat_dump(gs_bucket=logcat_gs_bucket)
     self.stack_tool_steps()
     if self.m.chromium.c.gyp_env.GYP_DEFINES.get('asan', 0) == 1:
       self.asan_device_teardown()
     self.test_report()
 
   def run_bisect_script(self, extra_src='', path_to_config='', **kwargs):
     self.m.step('prepare bisect perf regression',
@@ skipping 438 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)