Replace CrWinASanCov with ToTWinASanLibfuzzer on chromium.clang

CrWinASanCov tests an old configuration, and ToTWinASanLibfuzzer is the
new configuration. Move it into the "Windows|ASan" category in place of
CrWinASanCov.

Also add ToTWinASanLibfuzzer to the luci.chromium.clang console. It
seems they are supposed to be in sync.

R=bpastene@chromium.org, hans@chromium.org, hinoka@chromium.org
NOTRY=True

Bug: 937465
Change-Id: Ib5d1389bb5dc06d85bdbae522603c42a4acf2d2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1497356
Commit-Queue: Reid Kleckner <rnk@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637888}

infra/config/cr-buildbucket.cfg

@@ -1646,11 +1646,6 @@ buckets {
       mixins: "clang-ci"
       mixins: "win"
     }
-    builders {
-      name: "CrWinAsanCov"
-      mixins: "clang-ci"
-      mixins: "win"
-    }
     builders {
       name: "ToTAndroid"
       mixins: "clang-ci"

infra/config/luci-milo.cfg

@@ -1974,11 +1974,6 @@ consoles {
     category: "ToT Windows|x64"
     short_name: "dll"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/ToTWinASanLibfuzzer"
-    category: "ToT Windows|x64"
-    short_name: "fuz"
-  }
   builders {
     name: "buildbucket/luci.chrome.ci/ToTWinThinLTO64"
     category: "ToT Windows|x64"
@@ -2001,9 +1996,9 @@ consoles {
     short_name: "dll"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/CrWinAsanCov"
+    name: "buildbucket/luci.chromium.ci/ToTWinASanLibfuzzer"
     category: "ToT Windows|Asan"
-    short_name: "cov"
+    short_name: "fuz"
   }
   builders {
     name: "buildbot/chromium.clang/linux-win_cross-rel"
@@ -2212,9 +2207,9 @@ consoles {
     short_name: "dll"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/CrWinAsanCov"
+    name: "buildbucket/luci.chromium.ci/ToTWinASanLibfuzzer"
     category: "ToT Windows|Asan"
-    short_name: "cov"
+    short_name: "fuz"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-win_cross-rel"

infra/config/luci-scheduler.cfg

@@ -134,7 +134,6 @@ trigger {
   triggers: "Closure Compilation Linux"
   triggers: "CrWinAsan"
   triggers: "CrWinAsan(dll)"
-  triggers: "CrWinAsanCov"
   triggers: "CrWinGomaStaging"
   triggers: "Deterministic Android (dbg)"
   triggers: "Deterministic Android"
@@ -4680,16 +4679,6 @@ job {
   }
 }
 
-job {
-  id: "CrWinAsanCov"
-  acl_sets: "default"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "CrWinAsanCov"
-  }
-}
-
 job {
   id: "ToTAndroid"
   acl_sets: "default"

testing/buildbot/test_suite_exceptions.pyl

@@ -77,7 +77,6 @@
     'remove_from': [
       # chromium.clang
       'CrWinAsan(dll)', # https://crbug.com/935598
-      'CrWinAsanCov',
       'linux-win_cross-rel',
       'ToTLinuxTSan',  # https://crbug.com/368525
       # chromium.memory

testing/buildbot/waterfalls.pyl

@@ -730,18 +730,6 @@
           ],
         },
       },
-      'CrWinAsanCov': {
-        'test_suites': {
-          'gtest_tests': 'chromium_win_gtests',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'os': 'Windows-10-15063',
-            },
-          ],
-        },
-      },
       'ToTAndroid': {
         'additional_compile_targets': [
           'all',

tools/mb/mb_config.pyl

@@ -122,7 +122,6 @@
       'CFI Linux ToT': 'clang_tot_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on',
       'CrWinAsan': 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release_tot',
       'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_minimal_symbols_release_tot',
-      'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_minimal_symbols_release_tot',
 
       'linux-win_cross-rel': 'clang_tot_win_release_cross',
       'ToTAndroid': 'android_clang_tot_release_minimal_symbols',
@@ -1048,10 +1047,6 @@
       'android_without_codecs', 'release_trybot', 'minimal_symbols', 'strip_debug_info',
     ],
 
-    'asan_clang_edge_fuzzer_static_v8_heap_minimal_symbols_release_tot': [
-      'asan', 'clang_tot', 'edge', 'fuzzer', 'static', 'v8_heap', 'minimal_symbols', 'release',
-    ],
-
     'asan_clang_shared_v8_heap_minimal_symbols_release_tot': [
       'asan', 'clang_tot', 'shared', 'v8_heap', 'minimal_symbols', 'release',
     ],