[code coverage] Add all fuzzer targets

R=jbudorick,stgao,liaoyuke

Change-Id: I78ffec6525cd1d808a4b431ae1e2729b76357d46
Reviewed-on: https://chromium-review.googlesource.com/c/1372917
Commit-Queue: Shuotao Gao <stgao@chromium.org>
Reviewed-by: Shuotao Gao <stgao@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615834}

testing/buildbot/tryserver.chromium.linux.json

@@ -681,14 +681,6 @@
       }
     ],
     "isolated_scripts": [
-      {
-        "isolate_coverage_data": true,
-        "isolate_name": "blink_json_parser_fuzzer",
-        "name": "blink_json_parser_fuzzer",
-        "swarming": {
-          "can_use_on_swarming_builders": false
-        }
-      },
       {
         "args": [
           "--additional-driver-flag=--no-sandbox",

testing/buildbot/waterfalls.pyl

@@ -1506,7 +1506,7 @@
         ],
         'test_suites': {
           'gtest_tests': 'chromium_linux_coverage_gtests',
-          'isolated_scripts': 'chromium_code_coverage_isolated_scripts',
+          'isolated_scripts': 'chromium_code_coverage_isolated_scripts_and_fuzzers',
         }
       },
       'linux-gtest-hackathon-dbg': {

tools/mb/mb.py

@@ -1101,7 +1101,14 @@ class MetaBuildWrapper(object):
       self.WriteFailureAndRaise('We should not be isolating %s.' % target,
                                 output_path=None)
 
-    if is_android and test_type != "script":
+    if test_type == 'fuzzer':
+      cmdline = [
+        '../../testing/test_env.py',
+        '../../tools/code_coverage/run_fuzz_target.py',
+        '--fuzzer', './' + target,
+        '--output-dir', '${ISOLATED_OUTDIR}',
+        '--timeout', '3600']
+    elif is_android and test_type != "script":
       cmdline = [
           '../../testing/test_env.py',
           '../../build/android/test_wrapper/logdog_wrapper.py',

tools/mb/mb_unittest.py

@@ -443,6 +443,31 @@ class UnitTest(unittest.TestCase):
     self.assertIn('c:\\fake_src\\out\\Default\\cc_perftests.isolated.gen.json',
                   mbw.files)
 
+  def test_gen_fuzzer(self):
+    files = {
+      '/tmp/swarming_targets': 'cc_perftests_fuzzer\n',
+      '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
+          "{'cc_perftests_fuzzer': {"
+          "  'label': '//cc:cc_perftests_fuzzer',"
+          "  'type': 'fuzzer',"
+          "}}\n"
+      ),
+      'c:\\fake_src\out\Default\cc_perftests_fuzzer.exe.runtime_deps': (
+          "cc_perftests_fuzzer\n"
+      ),
+    }
+    mbw = self.fake_mbw(files=files, win32=True)
+    self.check(['gen',
+                '-c', 'debug_goma',
+                '--swarming-targets-file', '/tmp/swarming_targets',
+                '--isolate-map-file',
+                '/fake_src/testing/buildbot/gn_isolate_map.pyl',
+                '//out/Default'], mbw=mbw, ret=0)
+    self.assertIn('c:\\fake_src\\out\\Default\\cc_perftests_fuzzer.isolate',
+                  mbw.files)
+    self.assertIn(
+        'c:\\fake_src\\out\\Default\\cc_perftests_fuzzer.isolated.gen.json',
+        mbw.files)
 
   def test_multiple_isolate_maps(self):
     files = {