chromium/trunk/unbundle-do-not-use-ZipAnalyzer-traits-header.patch

   1 From c8b965be5b61c2412df938e1feb380b69bd92ee9 Mon Sep 17 00:00:00 2001
   2 From: Stephan Hartmann <stha09@googlemail.com>
   3 Date: Thu, 6 Apr 2023 07:15:03 +0000
   4 Subject: [PATCH] [unbundle] do not use ZipAnalyzer traits header
   5
   6 It is enough to include chrome/common/safe_browsing/archive_analyzer_results.h.
   7
   8 Bug: None
   9 Change-Id: Ia63a66b77c073fa4fdb8470db34b4c24722293cc
  10 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4373706
  11 Reviewed-by: Daniel Rubery <drubery@chromium.org>
  12 Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
  13 Cr-Commit-Position: refs/heads/main@{#1127041}
  14 ---
  15  chrome/services/file_util/public/mojom/BUILD.gn   | 3 ++-
  16  chrome/services/file_util/safe_archive_analyzer.h | 1 +
  17  2 files changed, 3 insertions(+), 1 deletion(-)
  18
  19 diff --git a/chrome/services/file_util/public/mojom/BUILD.gn b/chrome/services/file_util/public/mojom/BUILD.gn
  20 index b9e80cc748e..461d2d00b5e 100644
  21 --- a/chrome/services/file_util/public/mojom/BUILD.gn
  22 +++ b/chrome/services/file_util/public/mojom/BUILD.gn
  23 @@ -55,7 +55,8 @@ mojom("mojom") {
  24            cpp = "::safe_browsing::ArchiveAnalyzerResults"
  25          },
  26        ]
  27 -      traits_headers = [ "//chrome/common/safe_browsing/zip_analyzer.h" ]
  28 +      traits_headers =
  29 +          [ "//chrome/common/safe_browsing/archive_analyzer_results.h" ]
  30        traits_private_headers = [ "safe_archive_analyzer_param_traits.h" ]
  31        traits_public_deps = [
  32          "//chrome/common/safe_browsing:proto",
  33 diff --git a/chrome/services/file_util/safe_archive_analyzer.h b/chrome/services/file_util/safe_archive_analyzer.h
  34 index 62307b87839..0231205377c 100644
  35 --- a/chrome/services/file_util/safe_archive_analyzer.h
  36 +++ b/chrome/services/file_util/safe_archive_analyzer.h
  37 @@ -7,6 +7,7 @@
  38
  39  #include "chrome/common/safe_browsing/archive_analyzer_results.h"
  40  #include "chrome/common/safe_browsing/rar_analyzer.h"
  41 +#include "chrome/common/safe_browsing/zip_analyzer.h"
  42  #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
  43  #include "mojo/public/cpp/bindings/remote.h"
  44