Move minizip fuzzers to //third_party/minizip

BUG=900749

Change-Id: Ia2429113cc5b2bef49e25643fa2176e883029e2b
Reviewed-on: https://chromium-review.googlesource.com/c/1311854
Commit-Queue: Anand Mistry <amistry@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Max Moroz <mmoroz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605533}

BUILD.gn

@@ -371,6 +371,15 @@ group("gn_all") {
         [ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ]
   }
 
+  if (is_linux || is_chromeos) {
+    # This is only used by ChromeOS, but we want maximal fuzzer coverage, so
+    # run it under linux too.
+    deps += [
+      "//third_party/minizip:minizip_compress_fuzzer",
+      "//third_party/minizip:minizip_uncompress_fuzzer",
+    ]
+  }
+
   if (is_linux || is_android) {
     deps += [
       "//third_party/breakpad:breakpad_unittests",

testing/libfuzzer/fuzzers/BUILD.gn

@@ -343,29 +343,6 @@ fuzzer_test("hash_fuzzer") {
   ]
 }
 
-# third_party/minizip/src is checked out only on unix platform by gclient.
-if (is_linux) {
-  fuzzer_test("minizip_uncompress_fuzzer") {
-    sources = [
-      "minizip_uncompress_fuzzer.cc",
-    ]
-    deps = [
-      "//third_party/minizip:minizip",
-    ]
-    seed_corpus = "//testing/libfuzzer/fuzzers/minizip_uncompress_corpus"
-  }
-
-  fuzzer_test("minizip_compress_fuzzer") {
-    sources = [
-      "minizip_compress_fuzzer.cc",
-    ]
-    deps = [
-      "//base",
-      "//third_party/minizip:minizip",
-    ]
-  }
-}
-
 action("gen_javascript_parser_proto") {
   # Only targets in this file and the top-level visibility target can
   # depend on this.

third_party/minizip/BUILD.gn

@@ -2,6 +2,8 @@
 # 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")
+
 config("minizip_compiler_flags") {
   if (is_clang) {
     cflags = [ "-Wno-unused-function" ]
@@ -89,7 +91,28 @@ static_library("minizip") {
 
   visibility = [
     # NOTE: Modifying visibility list requires approval from security team.
-    "//testing/libfuzzer/fuzzers:*",
+    ":minizip_compress_fuzzer",
+    ":minizip_uncompress_fuzzer",
     "//chrome/browser/resources/chromeos/zip_archiver/cpp:zip_archiver_library",
   ]
 }
+
+fuzzer_test("minizip_compress_fuzzer") {
+  sources = [
+    "minizip_compress_fuzzer.cc",
+  ]
+  deps = [
+    ":minizip",
+    "//base",
+  ]
+}
+
+fuzzer_test("minizip_uncompress_fuzzer") {
+  sources = [
+    "minizip_uncompress_fuzzer.cc",
+  ]
+  deps = [
+    ":minizip",
+  ]
+  seed_corpus = "minizip_uncompress_corpus"
+}

third_party/minizip/DEPS

@@ -2,4 +2,8 @@ specific_include_rules = {
   'mz_os_chrome\.cc': [
     '+base/rand_util.h',
   ],
+  '.*_fuzzer\.cc': [
+    '+base',
+    '+testing/libfuzzer/fuzzers',
+  ],
 }