Revert of Split parts of //chrome/utility's BUILD.gn into //chrome/utility/safe_browsing/mac.

chrome/utility/BUILD.gn

 # Copyright 2014 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("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/sysroot.gni")
 
+# Provides a way for the utility library to push ldflags to dependents.
+config("utility_ldflags") {
+  if (is_mac && safe_browsing_mode == 1) {
+    libs = [
+      "bz2",
+      "CoreFoundation.framework",
+    ]
+  }
+}
+
 static_library("utility") {
   sources = [
     "chrome_content_utility_client.cc",
     "chrome_content_utility_client.h",
     "chrome_content_utility_ipc_whitelist.cc",
     "chrome_content_utility_ipc_whitelist.h",
     "cloud_print/bitmap_image.cc",
     "cloud_print/bitmap_image.h",
     "cloud_print/pwg_encoder.cc",
     "cloud_print/pwg_encoder.h",
     "image_decoder_impl.cc",
     "image_decoder_impl.h",
     "ipc_shell_handler_win.cc",
     "ipc_shell_handler_win.h",
     "printing_handler.cc",
     "printing_handler.h",
     "shell_handler_impl_win.cc",
     "shell_handler_impl_win.h",
     "utility_message_handler.h",
   ]
 
   defines = []
   configs += [
     "//build/config:precompiled_headers",
     "//build/config/compiler:wexit_time_destructors",
   ]
+  all_dependent_configs = [ ":utility_ldflags" ]
 
   public_deps = []
   deps = [
     "//base",
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/common",
     "//chrome/common:mojo_bindings",
     "//components/safe_json/utility",
     "//components/search_engines",
@@ skipping 119 matching lines @@
 
   if (enable_print_preview || (enable_basic_printing && is_win)) {
     deps += [ "//pdf" ]
   } else {
     sources -= [
       "printing_handler.cc",
       "printing_handler.h",
     ]
   }
 
-  if (is_mac && safe_browsing_mode == 1) {
-    deps += [ "//chrome/utility/safe_browsing/mac" ]
+  if (safe_browsing_mode == 1) {
+    sources += [
+      "safe_browsing/mac/convert_big_endian.h",
+      "safe_browsing/mac/dmg_analyzer.cc",
+      "safe_browsing/mac/dmg_analyzer.h",
+      "safe_browsing/mac/dmg_iterator.cc",
+      "safe_browsing/mac/dmg_iterator.h",
+      "safe_browsing/mac/hfs.cc",
+      "safe_browsing/mac/hfs.h",
+      "safe_browsing/mac/read_stream.cc",
+      "safe_browsing/mac/read_stream.h",
+      "safe_browsing/mac/udif.cc",
+      "safe_browsing/mac/udif.h",
+    ]
+    deps += [ "//third_party/zlib" ]
   }
 }
+
+if (is_mac) {
+  import("//testing/libfuzzer/fuzzer_test.gni")
+  fuzzer_test("safe_browsing_dmg_fuzzer") {
+    sources = [
+      "safe_browsing/mac/convert_big_endian.h",
+      "safe_browsing/mac/fuzzer.cc",
+      "safe_browsing/mac/hfs.cc",
+      "safe_browsing/mac/hfs.h",
+      "safe_browsing/mac/read_stream.cc",
+      "safe_browsing/mac/read_stream.h",
+      "safe_browsing/mac/udif.cc",
+      "safe_browsing/mac/udif.h",
+    ]
+
+    additional_configs = [ ":utility_ldflags" ]
+
+    deps = [
+      "//base",
+      "//third_party/zlib",
+    ]
+  }
+}