Revert of Flip remaining non-lkgr linux memory bots to GN.

tools/mb/mb_config.pyl

 # Copyright 2015 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.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 332 matching lines @@
       'Mac10.11 Tests': 'none',
       'Mac10.9 Tests (dbg)': 'none',
       'Mac10.9 Tests': 'none',
       'iOS_Device': 'ios_gyp',
       'iOS_Device_(ninja)': 'ios_gyp',
       'iOS_Device_GN': 'ios_gn',
       'iOS_Simulator_(dbg)': 'ios_gyp',
       'iOS_Simulator_GN_(dbg)': '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_msan_gn_release_bot',
+        'swarming_gyp_msan_release_bot',
       'Chromium Linux TSan Builder':
-        'swarming_tsan_disable_nacl_gn_release_bot',
+        'swarming_gyp_tsan_disable_nacl_release_bot',
       'Chromium Windows Builder (DrMemory x64)':
         'gyp_drmemory_shared_release_x64',
       'Chromium Windows Builder (DrMemory)': 'gyp_drmemory_shared_release_x86',
       'Linux ChromeOS MSan Tests': 'none',
       'Linux MSan Tests': 'none',
       'Linux TSan Tests': 'none',
       'Windows Browser (DrMemory full) (1)': 'none',
       'Windows Browser (DrMemory full) (10)': 'none',
       'Windows Browser (DrMemory full) (11)': 'none',
       'Windows Browser (DrMemory full) (12)': 'none',
@@ skipping 311 matching lines @@
       'cast_shell_linux': 'cast_gn_release_trybot',
       'chromeos_amd64-generic_variable': 'findit',
       'chromeos_amd64-generic_chromium_compile_only_ng': 'cros_chrome_sdk_gyp',
       'chromeos_daisy_chromium_compile_only_ng': 'cros_chrome_sdk_gyp',
       'chromeos_daisy_variable': 'findit',
       'chromeos_x86-generic_chromium_compile_only_ng': 'cros_chrome_sdk_gyp',
       'chromeos_x86-generic_variable': 'findit',
       'chromium_presubmit': 'none',
       'linux_arm': 'swarming_gyp_release_trybot_arm',
       'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot',
-      'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gn_release_trybot',
+      'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gyp_release_trybot',
       'linux_chromium_asan_variable': 'findit',
       'linux_chromium_browser_side_navigation_rel': 'gyp_release_trybot',
       'linux_chromium_cast_variable': 'findit',
       'linux_chromium_cfi_rel_ng': 'gn_cfi_release_trybot',
       'linux_chromium_chromeos_asan_rel_ng':
         'swarming_asan_lsan_chromeos_gyp_release_trybot',
       'linux_chromium_chromeos_asan_variable': 'findit',
       'linux_chromium_chromeos_compile_dbg_ng':
         'swarming_chromeos_gyp_debug_trybot',
       'linux_chromium_chromeos_compile_rel_ng':
@@ skipping 10 matching lines @@
       'linux_chromium_clobber_rel_ng': 'gn_release_trybot',
       'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
       'linux_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
       'linux_chromium_compile_rel_ng': 'swarming_gn_release_trybot',
       'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
       'linux_chromium_dbg_ng': 'swarming_gn_debug_trybot',
       'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot',
       '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_gn_release_trybot',
+      'linux_chromium_msan_rel_ng': 'swarming_msan_gyp_release_trybot',
       'linux_chromium_practice_rel_ng': 'gyp_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_tsan_disable_nacl_gn_release_trybot',
+        'swarming_gyp_tsan_disable_nacl_release_trybot',
       'linux_chromium_variable': 'findit',
       'linux_chromium_variable_32': 'findit',
       'linux_chromium_variable_chrome': 'findit',
       'linux_chromium_variable_clobber': 'findit',
       'linux_chromium_variable_32_chrome': 'findit',
       'linux_chromium_variable_32_clobber': 'findit',
       'linux_chromium_webkit_asan_variable': 'findit',
       'linux_chromium_webkit_leak_variable': 'findit',
       'linux_chromium_webkit_msan_variable': 'findit',
       'linux_chromium_webkit_variable': 'findit',
@@ skipping 714 matching lines @@
 
     'swarming_gyp_asan_clang_fuzzer_static_v8_heap_x86_full_symbols_release': [
       'swarming', 'gyp', 'asan', 'clang', 'fuzzer', 'static', 'v8_heap',
       'full_symbols', 'release',
     ],
 
     'swarming_asan_dcheck_gyp_release_bot': [
       'swarming', 'asan', 'dcheck_always_on', 'gyp', 'release_bot',
     ],
 
+    'swarming_asan_lsan_gyp_release_trybot': [
+      'swarming', 'asan', 'lsan', 'release_trybot',
+    ],
+
     'swarming_asan_lsan_chromeos_gyp_release_trybot': [
       'swarming', 'asan', 'lsan', 'chromeos', 'release_trybot',
     ],
 
-    'swarming_asan_lsan_gn_release_bot': [
-      'swarming', 'asan', 'lsan', 'gn', 'release_bot',
-    ],
-
-    'swarming_asan_lsan_gn_release_trybot': [
-      'swarming', 'asan', 'lsan', 'gn', 'release_trybot',
-    ],
-
-    'swarming_asan_lsan_chromeos_gyp_release_bot': [
-      'swarming', 'asan', 'lsan', 'chromeos', 'gyp', 'release_bot',
-    ],
-
-    'swarming_asan_lsan_full_symbols_gyp_release_bot': [
-      'swarming', 'asan', 'lsan', 'full_symbols', 'gyp', 'release_bot',
-    ],
-
     'swarming_chromeos_gn_release_trybot': [
       'swarming', 'chromeos_with_codecs', 'gn', 'release_trybot',
     ],
 
     'swarming_chromeos_gyp_debug_bot': [
       'swarming', 'chromeos_with_codecs', 'gyp', 'debug_bot',
     ],
 
     'swarming_chromeos_gyp_debug_trybot': [
       'swarming', 'chromeos_with_codecs', 'gyp', 'debug_trybot',
@@ skipping 36 matching lines @@
     ],
 
     'swarming_gyp_debug_trybot': [
       'swarming', 'gyp', 'debug_trybot',
     ],
 
     'swarming_gpu_tests_gyp_release_trybot': [
       'swarming', 'gpu_tests', 'gyp', 'release_trybot',
     ],
 
-    'swarming_msan_gn_release_bot': [
-      'swarming', 'msan', 'gn', 'release_bot',
-    ],
-
-    'swarming_msan_gn_release_trybot': [
-      'swarming', 'msan', 'gn', 'release_trybot',
-    ],
-
     'swarming_msan_gyp_release_trybot': [
       'swarming', 'chromeos', 'msan', 'gyp', 'release_trybot',
     ],
 
     'swarming_gn_asan_lsan_release_bot_x64': [
       'swarming', 'gn', 'asan', 'lsan', 'release_bot', 'x64',
     ],
 
     'swarming_gn_msan_release_bot_x64': [
       'swarming', 'gn', 'msan', 'release_bot', 'x64',
@@ skipping 200 matching lines @@
     ],
 
     'swarming_gyp_debug_bot_no_symbols_x86': [
       'swarming', 'gyp', 'debug_bot', 'no_symbols', 'x86',
     ],
 
     'swarming_gyp_debug_trybot_x86': [
       'swarming', 'gyp', 'debug_trybot', 'x86',
     ],
 
+    'swarming_gyp_msan_release_bot': [
+      'swarming', 'gyp', 'msan', 'release_bot',
+    ],
+
     'swarming_gyp_release_bot': [
       'swarming', 'gyp', 'release_bot',
     ],
 
     'swarming_gyp_release_bot_arm': [
       'swarming', 'gyp', 'release_bot', 'arm', 'crosscompile',
     ],
 
     'swarming_gyp_release_bot_minimal_symbols_x64': [
       'swarming', 'gyp', 'release_bot_minimal_symbols', 'x64',
@@ skipping 17 matching lines @@
 
     'swarming_gyp_release_trybot_minimal_symbols_x86': [
       'swarming', 'gyp', 'release_trybot', 'minimal_symbols', 'x86',
     ],
 
     'swarming_gyp_syzyasan_release_trybot_minimal_symbols_x86': [
       'swarming', 'gyp', 'syzyasan', 'release_trybot', 'minimal_symbols',
       'x86',
     ],
 
-    'swarming_tsan_disable_nacl_gn_release_bot': [
-      'swarming', 'tsan', 'disable_nacl', 'gn', 'release_bot',
+    'swarming_gyp_tsan_disable_nacl_release_bot': [
+      'swarming', 'gyp', 'tsan', 'disable_nacl', 'release_bot',
     ],
 
-    'swarming_tsan_disable_nacl_gn_release_trybot': [
-      'swarming', 'tsan', 'disable_nacl', 'gn', 'release_trybot',
+    'swarming_gyp_tsan_disable_nacl_release_trybot': [
+      'swarming', 'gyp', 'tsan', 'disable_nacl', 'release_trybot',
     ],
 
     'gn_debug_bot_minimal_symbols_chrome_with_codecs': [
       'gn', 'debug_bot_minimal_symbols', 'chrome_with_codecs',
     ],
 
     'gn_debug_static_bot_chrome_with_codecs': [
       'gn', 'debug_static_bot', 'chrome_with_codecs',
     ],
 
@@ skipping 456 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }