WebRTC: Re-enable TSan deadlock detection.

scripts/slave/recipe_modules/webrtc/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.
 
 from infra.libs.infra_types import freeze
 from slave import recipe_api
 from slave.recipe_modules.webrtc import builders
 
 
 class WebRTCApi(recipe_api.RecipeApi):
@@ skipping 303 matching lines @@
       if parallel:
         test_executable = self.m.chromium.c.build_dir.join(
           self.m.chromium.c.build_config_fs, test)
         args = [test_executable, '--'] + args
         test = self.m.path['checkout'].join('third_party', 'gtest-parallel',
                                             'gtest-parallel')
         python_mode = True
         annotate = None  # The parallel script doesn't output gtest format.
         flakiness_dash = False
 
-      # TODO(kjellander): Disable deadlock detection for all TSan builders
-      # except the one in the client.webrtc.fyi waterfall. Remove when
-      # webrtc:4106 is fixed.
-      if ('with deadlock detection' not in self.m.properties.get('buildername')
-          and self.m.chromium.c.gyp_env.GYP_DEFINES.get('tsan') == 1):
-        env['TSAN_OPTIONS'] = 'detect_deadlocks=0'
-
       self.m.chromium.runtest(
           test=test, args=args, name=name, annotate=annotate, xvfb=True,
           flakiness_dash=flakiness_dash, python_mode=python_mode,
           test_type=test_type, env=env)
 
   def _adb_install_apk(self, apk_name):
     """Installs an APK on an Android device.
 
     We cannot use chromium_android.adb_install_apk since it will fail due to
     the automatic path creation becomes invalid due to WebRTC's usage of
@@ skipping 105 matching lines @@
   def clean_test_output(self):
     """Remove all test output in out/, since we have tests leaking files."""
     out_dir = self.m.path['checkout'].join('out')
     self.m.python('clean test output files',
                   script=self.resource('cleanup_files.py'),
                   args=[out_dir],
                   infra_step=True)
 
   def virtual_webcam_check(self):
     self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py'))