Revert "Remove references to crash_service, which is no longer needed."

scripts/slave/recipe_modules/chromium_tests/api.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 collections
 import contextlib
 import copy
 import itertools
 import json
 
@@ skipping 304 matching lines @@
       tests.insert(0, steps.DiagnoseGomaTest())
       tests_including_triggered.insert(0, steps.DiagnoseGomaTest())
 
     return tests, tests_including_triggered
 
   def get_compile_targets(self, bot_config, bot_db, tests):
     assert isinstance(bot_db, bdb_module.BotConfigAndTestDB), \
         "bot_db argument %r was not a BotConfigAndTestDB" % (bot_db)
 
     compile_targets = bot_config.get_compile_targets(self, bot_db, tests)
-    return sorted(set(compile_targets))
+
+    # Only add crash_service when we have explicit compile targets.
+    compile_targets = set(compile_targets)
+    if (self.m.platform.is_win and
+        compile_targets and
+        'all' not in compile_targets):
+      compile_targets.add('crash_service')
+
+    return sorted(compile_targets)
 
   def transient_check(self, update_step, command):
     """Runs command, checking for transience if this is a try job.
 
     * command is a function which takes an argument of type (str -> str),
       which is a test name transformation (it adds "with patch" or "without
       patch") and runs the command.
     * update_step is the bot_update step used for deapplying the patch.
     """
     if self.m.tryserver.is_tryserver:
@@ skipping 213 matching lines @@
       #TODO(prasadv): Remove this hack and implement specific functions
       # at the point of call.
       remove_system_webview = bot_config.get('remove_system_webview')
       perf_setup = bot_config.matches_any_bot_id(lambda bot_id:
           bot_id['mastername'].startswith('chromium.perf') or
           bot_id['mastername'].startswith('tryserver.chromium.perf'))
       self.m.chromium_android.common_tests_setup_steps(
           perf_setup=perf_setup,
           remove_system_webview=remove_system_webview)
 
+    if self.m.platform.is_win:
+      self.m.chromium.crash_handler()
+
     try:
       yield
     finally:
       if self.m.platform.is_win:
         self.m.chromium.process_dumps()
 
       if self.m.chromium.c.TARGET_PLATFORM == 'android':
         if require_device_steps:
           self.m.chromium_android.common_tests_final_steps(
               logcat_gs_bucket='chromium-android')
@@ skipping 120 matching lines @@
         additional_names=additional_names,
         config_file_name=config_file_name,
         use_mb=use_mb,
         mb_mastername=mb_mastername,
         mb_buildername=mb_buildername,
         build_output_dir=build_output_dir,
         cros_board=self.m.chromium.c.TARGET_CROS_BOARD)
 
     compile_targets = self.m.filter.compile_targets[:]
 
+    # Add crash_service to compile_targets. This is done after filtering compile
+    # targets out because crash_service should always be there on windows.
+    # TODO(akuegel): Need to solve this in a better way. crbug.com/478053
+    if (self.m.platform.is_win and compile_targets and
+        'crash_service' not in compile_targets):
+      compile_targets.extend(['crash_service'])
+
     # Emit more detailed output useful for debugging.
     analyze_details = {
         'test_targets': test_targets,
         'additional_compile_targets': additional_compile_targets,
         'self.m.filter.compile_targets': self.m.filter.compile_targets,
         'self.m.filter.test_targets': self.m.filter.test_targets,
         'compile_targets': compile_targets,
     }
     with contextlib.closing(recipe_util.StringListIO()) as listio:
       json.dump(analyze_details, listio, indent=2, sort_keys=True)
@@ skipping 113 matching lines @@
   def get_compile_targets_for_scripts(self):
     return self.m.python(
         name='get compile targets for scripts',
         script=self.m.path['checkout'].join(
             'testing', 'scripts', 'get_compile_targets.py'),
         args=[
             '--output', self.m.json.output(),
             '--',
         ] + self.get_common_args_for_scripts(),
         step_test_data=lambda: self.m.json.test_api.output({}))