WebRTC: Move TSan v2 and SyzyASan bots to main build+try masters.

masters/master.tryserver.webrtc/master.cfg

Index: masters/master.tryserver.webrtc/master.cfg
diff --git a/masters/master.tryserver.webrtc/master.cfg b/masters/master.tryserver.webrtc/master.cfg
index ae8fd9b33a6c344e754a210644e38c7331c631ab..9dcc729baaa3af721a2903e4dcde2627d96b9110 100755
--- a/masters/master.tryserver.webrtc/master.cfg
+++ b/masters/master.tryserver.webrtc/master.cfg
@@ -151,6 +151,23 @@ b_win_baremetal = {
     'slavebuilddir': 'win',
 }
 
+
+b_win_asan = {
+    'name': 'win_asan',
+    'factory': win().WebRTCFactory(
+        target='Release',
+        slave_type='Trybot',
+        tests=tests,
+        factory_properties={
+            'asan': True,
+            'gclient_env': {
+                'GYP_DEFINES': ('syzyasan=1 win_z7=1 chromium_win_pch=0 '
+                                'component=static_library'),
+                'GYP_USE_SEPARATE_MSPDBSRV': '1',
+            },
+        }),
+}
+
 # Mac.
 b_mac = {
     'name': 'mac',
@@ -307,6 +324,24 @@ b_linux_tsan = {
         }),
 }
 
+b_linux_tsan2 = {
+    'name': 'linux_tsan2',
+    'factory': linux().WebRTCFactory(
+        target='Release',
+        slave_type='Trybot',
+        options=clang_options,
+        tests=tests,
+        factory_properties={
+            'tsan': True,
+            'tsan_suppressions_file':
+                'src/tools/valgrind-webrtc/tsan_v2/suppressions.txt',
+            'gclient_env': {
+                'GYP_DEFINES': ('tsan=1 release_extra_cflags=-g '
+                                'use_allocator=none'),
+            },
+        }),
+}
+
 b_linux_asan = {
     'name': 'linux_asan',
     'factory': linux().WebRTCFactory(
@@ -391,6 +426,7 @@ c['builders'] = [
   b_win_rel,
   b_win_x64_rel,
   b_win_baremetal,
+  b_win_asan,
   b_mac,
   b_mac_rel,
   b_mac_x64_rel,
@@ -403,6 +439,7 @@ c['builders'] = [
   b_linux_baremetal,
   b_linux_memcheck,
   b_linux_tsan,
+  b_linux_tsan2,
   b_linux_asan,
   b_android,
   b_android_rel,
@@ -438,6 +475,7 @@ pools['webrtc'].append('win')
 pools['webrtc'].append('win_rel')
 pools['webrtc'].append('win_x64_rel')
 pools['webrtc'].append('win_baremetal')
+pools['webrtc'].append('win_asan')
 pools['webrtc'].append('mac')
 pools['webrtc'].append('mac_rel')
 pools['webrtc'].append('mac_x64_rel')
@@ -450,6 +488,7 @@ pools['webrtc'].append('linux_rel')
 pools['webrtc'].append('linux_baremetal')
 pools['webrtc'].append('linux_memcheck')
 pools['webrtc'].append('linux_tsan')
+pools['webrtc'].append('linux_tsan2')
 pools['webrtc'].append('linux_asan')
 pools['webrtc'].append('android')
 pools['webrtc'].append('android_rel')