Change asan_coverage(deprecated) flag to sanitizer_coverage. Enable edge-level code coverage by def…

masters/master.chromium.lkgr/master_lkgr_cfg.py

Index: masters/master.chromium.lkgr/master_lkgr_cfg.py
diff --git a/masters/master.chromium.lkgr/master_lkgr_cfg.py b/masters/master.chromium.lkgr/master_lkgr_cfg.py
index d5f4a6753ff2f670767080d2cbdc05da4048c275..e4f1f9c457ad8f3c46df006a8fd0650bac887376 100644
--- a/masters/master.chromium.lkgr/master_lkgr_cfg.py
+++ b/masters/master.chromium.lkgr/master_lkgr_cfg.py
@@ -135,7 +135,7 @@ F('linux64_full', linux().ChromiumFactory(
         'gs_acl': 'public-read',
         'gclient_env': {'GYP_DEFINES':'target_arch=x64'}}))
 
-asan_rel_gyp = ('asan=1 lsan=1 asan_coverage=1 '
+asan_rel_gyp = ('asan=1 lsan=1 sanitizer_coverage=3 '
                 'v8_enable_verify_heap=1 enable_ipc_fuzzer=1 ')
 
 B('ASAN Release', 'linux_asan_rel', 'compile', 'chromium_lkgr')
@@ -150,7 +150,7 @@ F('linux_asan_rel', linux().ChromiumASANFactory(
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': asan_rel_gyp}}))
 
-asan_rel_sym_gyp = ('asan=1 lsan=1 asan_coverage=1 '
+asan_rel_sym_gyp = ('asan=1 lsan=1 sanitizer_coverage=3 '
                     'v8_enable_verify_heap=1 enable_ipc_fuzzer=1 '
                     'release_extra_cflags="-O1 -fno-inline-functions '
                     '-fno-inline" ')
@@ -166,7 +166,7 @@ F('linux_asan_rel_sym', linux().ChromiumASANFactory(
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': asan_rel_sym_gyp}}))
 
-asan_debug_gyp = ('asan=1 lsan=1 asan_coverage=1 enable_ipc_fuzzer=1')
+asan_debug_gyp = ('asan=1 lsan=1 sanitizer_coverage=3 enable_ipc_fuzzer=1 ')
 
 B('ASAN Debug', 'linux_asan_dbg', 'compile', 'chromium_lkgr')
 F('linux_asan_dbg', linux().ChromiumASANFactory(
@@ -196,10 +196,10 @@ F('linux_chromiumos_asan_rel', linux().ChromiumASANFactory(
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': asan_chromiumos_rel_gyp}}))
 
-asan_ia32_v8_arm = ('asan=1 asan_coverage=1 disable_nacl=1 '
+asan_ia32_v8_arm = ('asan=1 sanitizer_coverage=3 disable_nacl=1 '
                     'v8_target_arch=arm host_arch=x86_64 target_arch=ia32 '
                     'sysroot=/var/lib/chroot/precise32bit chroot_cmd=precise32 '
-                    'v8_enable_verify_heap=1 enable_ipc_fuzzer=1')
+                    'v8_enable_verify_heap=1 enable_ipc_fuzzer=1 ')
 
 asan_ia32_v8_arm_rel_sym = ('%s release_extra_cflags="-O1 '
                             '-fno-inline-functions -fno-inline"' %
@@ -283,8 +283,8 @@ F('linux_tsan_dbg', linux().ChromiumFactory(
 
 # The build process for MSan is described at
 # http://dev.chromium.org/developers/testing/memorysanitizer
-msan_gyp = ('msan=1 use_instrumented_libraries=1 '
-            'instrumented_libraries_jobs=5 ')
+msan_gyp = ('msan=1 sanitizer_coverage=3 '
+            'use_instrumented_libraries=1 instrumented_libraries_jobs=5 ')
 
 B('MSAN Release (no origins)', 'linux_msan_rel_no_origins', 'compile',
   'chromium_lkgr')
@@ -319,7 +319,7 @@ F('telemetry_harness_upload',
 
 # The build process for UBSan vptr is described at
 # http://dev.chromium.org/developers/testing/undefinedbehaviorsanitizer
-ubsan_gyp = ('ubsan=1')
+ubsan_gyp = ('ubsan=1 sanitizer_coverage=3 ')
 
 B('UBSan Release', 'linux_ubsan_rel', 'compile', 'chromium_lkgr')
 F('linux_ubsan_rel', linux().ChromiumFactory(
@@ -333,7 +333,7 @@ F('linux_ubsan_rel', linux().ChromiumFactory(
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': ubsan_gyp}}))
 
-ubsan_vptr_gyp = ('ubsan_vptr=1')
+ubsan_vptr_gyp = ('ubsan_vptr=1 sanitizer_coverage=3 ')
 
 B('UBSan vptr Release', 'linux_ubsan_vptr_rel', 'compile', 'chromium_lkgr')
 F('linux_ubsan_vptr_rel', linux().ChromiumFactory(