[Zucchini] Restructure fuzzer directory

More fuzzers need to be added to Zucchini for launch including
adding support for protobuf based fuzzers. To facilitate this a new
fuzzers/ subdirectory will help to separate Zucchini from its fuzz
related infrastructure.

Bug: 835341
Change-Id: Ib18bfe9bb0b0050e94fa7bdca22fb99c735d9141
Reviewed-on: https://chromium-review.googlesource.com/1026475
Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Calder Kitagawa <ckitagawa@google.com>
Cr-Commit-Position: refs/heads/master@{#553254}
NOKEYCHECK=True
GitOrigin-RevId: 4725b4fbb75b0f4b2dda8f56e644ca6ef546cd0e

5 files changed, 39 insertions, 26 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 58db302..1204cd4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//chrome/process_version_rc_template.gni")
-import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 
 static_library("zucchini_lib") {
@@ -124,31 +123,6 @@ if (is_win) {
   }
 }
 
-# To download the corpus for local fuzzing use:
-# gsutil -m rsync \
-#   gs://clusterfuzz-corpus/libfuzzer/zucchini_disassembler_win32_fuzzer \
-#   components/zucchini/testdata/disassembler_win32_fuzzer
-fuzzer_test("zucchini_disassembler_win32_fuzzer") {
-  sources = [
-    "disassembler_win32_fuzzer.cc",
-  ]
-  deps = [
-    ":zucchini_lib",
-    "//base",
-  ]
-}
-
-fuzzer_test("zucchini_patch_fuzzer") {
-  sources = [
-    "patch_fuzzer.cc",
-  ]
-  deps = [
-    ":zucchini_lib",
-    "//base",
-  ]
-  seed_corpus = "testdata/patch_fuzzer"
-}
-
 test("zucchini_unittests") {
   sources = [
     "abs32_utils_unittest.cc",
@@ -210,3 +184,12 @@ test("zucchini_integration_test") {
     "//testing/gtest",
   ]
 }
+
+# Group to build and depend on all the Zucchini related fuzzers.
+group("zucchini_fuzzers") {
+  testonly = true
+  deps = [
+    "//components/zucchini/fuzzers:zucchini_disassembler_win32_fuzzer",
+    "//components/zucchini/fuzzers:zucchini_patch_fuzzer",
+  ]
+}
diff --git a/fuzzers/BUILD.gn b/fuzzers/BUILD.gn
new file mode 100644
index 0000000..2e489fd
--- /dev/null
+++ b/fuzzers/BUILD.gn
@@ -0,0 +1,30 @@
+# Copyright 2018 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.
+
+import("//testing/libfuzzer/fuzzer_test.gni")
+
+# To download the corpus for local fuzzing use:
+# gsutil -m rsync \
+#   gs://clusterfuzz-corpus/libfuzzer/zucchini_disassembler_win32_fuzzer \
+#   components/zucchini/fuzzing/testdata/disassembler_win32_fuzzer
+fuzzer_test("zucchini_disassembler_win32_fuzzer") {
+  sources = [
+    "disassembler_win32_fuzzer.cc",
+  ]
+  deps = [
+    "//base",
+    "//components/zucchini:zucchini_lib",
+  ]
+}
+
+fuzzer_test("zucchini_patch_fuzzer") {
+  sources = [
+    "patch_fuzzer.cc",
+  ]
+  deps = [
+    "//base",
+    "//components/zucchini:zucchini_lib",
+  ]
+  seed_corpus = "testdata/patch_fuzzer"
+}
diff --git a/disassembler_win32_fuzzer.cc b/fuzzers/disassembler_win32_fuzzer.cc
index f432ddd..f432ddd 100644
--- a/disassembler_win32_fuzzer.cc
+++ b/fuzzers/disassembler_win32_fuzzer.cc
diff --git a/patch_fuzzer.cc b/fuzzers/patch_fuzzer.cc
index 2d1c9b7..2d1c9b7 100644
--- a/patch_fuzzer.cc
+++ b/fuzzers/patch_fuzzer.cc
diff --git a/testdata/patch_fuzzer/empty.zuc b/fuzzers/testdata/patch_fuzzer/empty.zuc
index 64eacf5..64eacf5 100644
--- a/testdata/patch_fuzzer/empty.zuc
+++ b/fuzzers/testdata/patch_fuzzer/empty.zuc