Re-land "Flip remaining non-lkgr linux memory bots to GN."

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 094389fd3fb107ded08d4e90d8d8acd0f1358278..67447e836585340d62574564bffad3ee99542cd0 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -366,13 +366,24 @@
       'ios-simulator-gn': 'ios_gn',
     },
 
+    'chromium.memory': {
+      'Linux ASAN LSAN Builder': 'swarming_asan_lsan_gn_release_bot',
+      'Linux ASAN LSAN Tests (1)': 'none',
+      'Linux ASAN LSAN Tests (sandboxed)': 'none',
+      'Mac ASAN 64 Builder': 'swarming_asan_lsan_full_symbols_gyp_release_bot',
+      'Mac ASAN 64 Tests (1)': 'none',
+      'Linux Chromium OS ASAN LSAN Builder':
+        'swarming_asan_lsan_chromeos_gyp_release_bot',
+      'Linux Chromium OS ASAN LSAN Tests (1)': 'none',
+    },
+
     'chromium.memory.fyi': {
       'Chromium Linux ChromeOS MSan Builder':
         'swarming_gyp_chromeos_msan_release_bot',
       'Chromium Linux MSan Builder':
-        'swarming_gyp_msan_release_bot',
+        'swarming_msan_gn_release_bot',
       'Chromium Linux TSan Builder':
-        'swarming_gyp_tsan_disable_nacl_release_bot',
+        'swarming_tsan_disable_nacl_gn_release_bot',
       'Chromium Windows Builder (DrMemory x64)':
         'gyp_drmemory_shared_release_x64',
       'Chromium Windows Builder (DrMemory)': 'gyp_drmemory_shared_release_x86',
@@ -712,7 +723,7 @@
       'closure_compilation': 'closure_compilation',
       'linux_arm': 'swarming_gyp_release_trybot_arm',
       'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot',
-      'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gyp_release_trybot',
+      'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gn_release_trybot',
       'linux_chromium_asan_variable': 'findit',
       'linux_chromium_browser_side_navigation_rel': 'gn_release_trybot',
       'linux_chromium_cast_variable': 'findit',
@@ -743,11 +754,10 @@
       'linux_chromium_gn_chromeos_rel': 'chromeos_ozone_gn_release_trybot',
       'linux_chromium_gn_chromeos_variable': 'findit',
       'linux_chromium_gn_upload': 'gn_linux_upload',
-      'linux_chromium_msan_rel_ng': 'swarming_msan_gyp_release_trybot',
+      'linux_chromium_msan_rel_ng': 'swarming_msan_gn_release_trybot',
       'linux_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
-      'linux_chromium_tsan_rel_ng': 'swarming_tsan_gyp_release_trybot',
       'linux_chromium_tsan_rel_ng':
-        'swarming_gyp_tsan_disable_nacl_release_trybot',
+        'swarming_tsan_disable_nacl_gn_release_trybot',
       'linux_chromium_variable': 'findit',
       'linux_chromium_variable_32': 'findit',
       'linux_chromium_variable_chrome': 'findit',
@@ -1465,12 +1475,28 @@
       'swarming', 'asan', 'dcheck_always_on', 'gyp', 'release_bot',
     ],
 
+    'swarming_asan_lsan_chromeos_gyp_release_bot': [
+      'swarming', 'asan', 'lsan', 'chromeos', 'gyp', 'release_bot',
+    ],
+
     'swarming_asan_lsan_chromeos_gyp_release_trybot': [
-      'swarming', 'asan', 'lsan', 'chromeos', 'release_trybot',
+      'swarming', 'asan', 'lsan', 'chromeos', 'gyp', 'release_trybot',
+    ],
+
+    'swarming_asan_lsan_chromeos_gyp_release_trybot': [
+      'swarming', 'asan', 'lsan', 'chromeos', 'gyp', 'release_trybot',
+    ],
+
+    'swarming_asan_lsan_full_symbols_gyp_release_bot': [
+      'swarming', 'asan', 'lsan', 'full_symbols', 'gyp', 'release_bot',
+    ],
+
+    'swarming_asan_lsan_gn_release_bot': [
+      'swarming', 'asan', 'lsan', 'gn', 'release_bot',
     ],
 
-    'swarming_asan_lsan_gyp_release_trybot': [
-      'swarming', 'asan', 'lsan', 'release_trybot',
+    'swarming_asan_lsan_gn_release_trybot': [
+      'swarming', 'asan', 'lsan', 'gn', 'release_trybot',
     ],
 
     'swarming_chromeos_gn_release_trybot': [
@@ -1806,10 +1832,6 @@
       'swarming', 'gyp', 'debug_trybot',
     ],
 
-    'swarming_gyp_msan_release_bot': [
-      'swarming', 'gyp', 'msan', 'release_bot',
-    ],
-
     'swarming_gyp_release_trybot_arm': [
       'swarming', 'gyp', 'release_trybot', 'arm', 'crosscompile',
     ],
@@ -1818,16 +1840,20 @@
       'swarming', 'gyp', 'syzyasan', 'release_trybot', 'x86',
     ],
 
-    'swarming_gyp_tsan_disable_nacl_release_bot': [
-      'swarming', 'gyp', 'tsan', 'disable_nacl', 'release_bot',
+    'swarming_msan_gn_release_bot': [
+      'swarming', 'msan', 'gn', 'release_bot',
+    ],
+
+    'swarming_msan_gn_release_trybot': [
+      'swarming', 'msan', 'gn', 'release_trybot',
     ],
 
-    'swarming_gyp_tsan_disable_nacl_release_trybot': [
-      'swarming', 'gyp', 'tsan', 'disable_nacl', 'release_trybot',
+    'swarming_tsan_disable_nacl_gn_release_bot': [
+      'swarming', 'tsan', 'disable_nacl', 'gn', 'release_bot',
     ],
 
-    'swarming_msan_gyp_release_trybot': [
-      'swarming', 'msan', 'gyp', 'release_trybot',
+    'swarming_tsan_disable_nacl_gn_release_trybot': [
+      'swarming', 'tsan', 'disable_nacl', 'gn', 'release_trybot',
     ],
 
     'win_clang_debug_bot': [
@@ -2131,7 +2157,8 @@
 
     'msan': {
       'gn_args': ('is_msan=true msan_track_origins=2 '
-                  'use_prebuilt_instrumented_libraries=true'),
+                  'use_prebuilt_instrumented_libraries=true'
+                  'enable_remoting=false'),
       'gyp_defines': ('msan=1 msan_track_origins=2 '
                       'use_prebuilt_instrumented_libraries=1'),
     },