extra/chromium to 113.0.5672.92-1

This commit is contained in:
Kevin Mihelich 2023-05-09 12:44:29 +00:00
parent 7135f1d126
commit 0c9ecad6a7
18 changed files with 931 additions and 3 deletions

View file

@ -15,7 +15,7 @@
highmem=1
pkgname=chromium
pkgver=113.0.5672.63
pkgver=113.0.5672.92
pkgrel=1
_launcher_ver=8
_manual_clone=0
@ -37,18 +37,52 @@ options=('!lto') # Chromium adds its own flags for ThinLTO
source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
add-cstring-for-std-strlen-in-web_view_impl.cc.patch
swiftshader-add-cstdint-for-uint64_t.patch
dawn-iwyu-add-cstdint-for-uint8_t.patch
iwyu-add-stdint.h-for-various-int-types-in-base.patch
iwyu-add-cstdint-for-uintptr_t-in-device.patch
iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch
iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch
iwyu-add-stdint.h-for-integer-types-in-ui.patch
openscreen-iwyu-add-stdint.h.patch
pdfium-iwyu-add-stdint.h-for-uint32_t.patch
unbundle-do-not-use-ZipAnalyzer-traits-header.patch
iwyu-add-stdint.h-for-uint32_t-in-cc.patch
add-missing-includes-causing-build-errors.patch
iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch
iwyu-add-stdint.h-for-various-int-types-in-comp.patch
iwyu-add-stdint.h-for-various-integer-types-in-net.patch
iwyu-add-cstdint-for-int-types-in-s2cellid.patch
download-bubble-typename.patch
webauthn-variant.patch
random-fixes-for-gcc13.patch
disable-GlobalMediaControlsCastStartStop.patch
use-oauth2-client-switches-as-default.patch
0001-widevine-support-for-arm.patch
0002-Run-blink-bindings-generation-single-threaded.patch
0003-Fix-eu-strip-build-for-newer-GCC.patch)
sha256sums=('76cec11dc13abe6703305b0300e1fe24c8f547c1ff313f7be09db0e23d12ee1e'
sha256sums=('a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5'
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
'5f868cba9e4d387499711738adc6fd87ab9f1ef61f464016bc682660ae59206a'
'208f2ebcef5c690207e6e798ffbf9e92214e9d35f415c2f6b93efebad831b7e2'
'94baaaa6fbec0af6ec2e967f0b7440b4261a927e853e212d84f0aeaf56ae53f0'
'0003e737072f4f1b22ff932221595e85dd9bf65720ccac36f840cccb8000e3e1'
'ffe499d63c9c1074cbc3995c188c89b748388dbb9dccf975ce28a434c723acf7'
'7af466e4b5985cc9f0b33df2f3cd2e458c7cbfd7190505d105aad4401c9d072b'
'727588a1b42f6cfe54acf4759a0c3ad3778590d5a5cefcdcb54b579ba16b09c8'
'0914be53b2205b34e4da96f5a94505ac2a01e3639ff433535a23be2d0d581fa7'
'8c9662bed23bfd66ae76d044541f316624386ca4b3baef57a47289feb3db58a9'
'890b6836cea4c31513166db720b210da20d20bcd97a713545268cceffd707af5'
'ffa23c6233b47e0b4d688e30a44a2550e1236bbd0dc57b996d33dc42266530af'
'f6a0e149ef5195883c56a875ae366ed92d9960652f2657bfb65b5408badafc65'
'3255477d02d49ef86d47c727b9369f46dc787319bb648bf267a68f37e2041e50'
'94995b4e37671dcd27968bd5a2ebcf50e67bd22659a4bb4a5d0a4f81ff54f471'
'88320e0f08cc7b53807961d0735e7c1bd455a6faf9d8a5d056b7ba7809e37355'
'5dfbfd073f78c887bbffca2b644116571cc9b1196867e44e8fc0cbb40afcf1bc'
'd97dc00f66fa5868584e4b6d5ef817911eab2dc8022a37c75a00d063f4dac483'
'd464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a'
'590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7'
'ba4dd0a25a4fc3267ed19ccb39f28b28176ca3f97f53a4e9f5e9215280040ea0'
'7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302'
'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
'50fe9b0acf2cc2febed740fcc7ace2ee3be4db9d43bbae9feb21596c2360815b'
@ -85,7 +119,7 @@ declare -gA _system_libs=(
[re2]=re2
[snappy]=snappy
[woff2]=woff2
#[zlib]=minizip # broken include from chrome/common/safe_browsing/zip_analyzer.h
[zlib]=minizip
)
_unwanted_bundled_libs=(
$(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/')
@ -138,6 +172,22 @@ prepare() {
# Upstream fixes
patch -Np1 -i ../add-cstring-for-std-strlen-in-web_view_impl.cc.patch
patch -Np1 -d third_party/swiftshader <../swiftshader-add-cstdint-for-uint64_t.patch
patch -Np1 -d third_party/dawn <../dawn-iwyu-add-cstdint-for-uint8_t.patch
patch -Np1 -i ../iwyu-add-stdint.h-for-various-int-types-in-base.patch
patch -Np1 -i ../iwyu-add-cstdint-for-uintptr_t-in-device.patch
patch -Np1 -i ../iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch
patch -Np1 -i ../iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch
patch -Np1 -i ../iwyu-add-stdint.h-for-integer-types-in-ui.patch
patch -Np1 -d third_party/openscreen/src <../openscreen-iwyu-add-stdint.h.patch
patch -Np1 -d third_party/pdfium <../pdfium-iwyu-add-stdint.h-for-uint32_t.patch
patch -Np1 -i ../unbundle-do-not-use-ZipAnalyzer-traits-header.patch
patch -Np1 -i ../iwyu-add-stdint.h-for-uint32_t-in-cc.patch
patch -Np1 -i ../add-missing-includes-causing-build-errors.patch
patch -Np1 -i ../iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch
patch -Np1 -i ../iwyu-add-stdint.h-for-various-int-types-in-comp.patch
patch -Np1 -i ../iwyu-add-stdint.h-for-various-integer-types-in-net.patch
patch -Np1 -i ../iwyu-add-cstdint-for-int-types-in-s2cellid.patch
# Disable kGlobalMediaControlsCastStartStop by default
# https://crbug.com/1314342
@ -146,6 +196,7 @@ prepare() {
# Build fixes
patch -Np1 -i ../download-bubble-typename.patch
patch -Np1 -i ../webauthn-variant.patch
patch -Np1 -i ../random-fixes-for-gcc13.patch
# Link to system tools required by the build
mkdir -p third_party/node/linux/node-linux-x64/bin

View file

@ -0,0 +1,193 @@
From 6bbf6b001e085025cf33412b15eb79d46e2e670c Mon Sep 17 00:00:00 2001
From: Bruno Pitrus <brunopitrus@hotmail.com>
Date: Tue, 11 Apr 2023 19:32:13 +0000
Subject: [PATCH] Add missing includes causing build errors with GCC/libstdc++
13
Bug: 957519
Change-Id: If09ae682695714a19e37f3830013a003caba025a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4330267
Reviewed-by: Ken Rockot <rockot@google.com>
Auto-Submit: Bruno Pitrus <brunopitrus@hotmail.com>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1128822}
---
components/metrics/psi_memory_parser.h | 1 +
components/services/app_service/public/cpp/capability_access.h | 1 +
components/soda/constants.h | 1 +
device/base/synchronization/one_writer_seqlock.h | 1 +
device/bluetooth/public/cpp/bluetooth_uuid.h | 1 +
extensions/common/constants.h | 3 +++
extensions/renderer/bindings/api_invocation_errors.h | 1 +
net/base/parse_number.h | 2 ++
net/cookies/cookie_inclusion_status.h | 1 +
sandbox/linux/syscall_broker/broker_file_permission.h | 1 +
.../blink/public/common/bluetooth/web_bluetooth_device_id.h | 3 +++
.../public/common/origin_trials/origin_trial_public_key.h | 1 +
ui/gfx/geometry/linear_gradient.h | 2 ++
13 files changed, 19 insertions(+)
diff --git a/components/metrics/psi_memory_parser.h b/components/metrics/psi_memory_parser.h
index b8b22f4ab74..bf02be5074e 100644
--- a/components/metrics/psi_memory_parser.h
+++ b/components/metrics/psi_memory_parser.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
#define COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
+#include <cstdint>
#include <string>
#include "base/gtest_prod_util.h"
diff --git a/components/services/app_service/public/cpp/capability_access.h b/components/services/app_service/public/cpp/capability_access.h
index 991a993ba99..8050a888d81 100644
--- a/components/services/app_service/public/cpp/capability_access.h
+++ b/components/services/app_service/public/cpp/capability_access.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_SERVICES_APP_SERVICE_PUBLIC_CPP_CAPABILITY_ACCESS_H_
#define COMPONENTS_SERVICES_APP_SERVICE_PUBLIC_CPP_CAPABILITY_ACCESS_H_
+#include <memory>
#include <string>
#include <utility>
diff --git a/components/soda/constants.h b/components/soda/constants.h
index 82b2b98b2fa..b455e2a97da 100644
--- a/components/soda/constants.h
+++ b/components/soda/constants.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_SODA_CONSTANTS_H_
#define COMPONENTS_SODA_CONSTANTS_H_
+#include <cstdint>
#include <string>
#include "base/files/file_path.h"
diff --git a/device/base/synchronization/one_writer_seqlock.h b/device/base/synchronization/one_writer_seqlock.h
index e37a16b81be..b93f14140c6 100644
--- a/device/base/synchronization/one_writer_seqlock.h
+++ b/device/base/synchronization/one_writer_seqlock.h
@@ -6,6 +6,7 @@
#define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
#include <atomic>
+#include <cstddef>
#include <cstdint>
#include <type_traits>
diff --git a/device/bluetooth/public/cpp/bluetooth_uuid.h b/device/bluetooth/public/cpp/bluetooth_uuid.h
index b4bedf01570..d636ba62e2f 100644
--- a/device/bluetooth/public/cpp/bluetooth_uuid.h
+++ b/device/bluetooth/public/cpp/bluetooth_uuid.h
@@ -5,6 +5,7 @@
#ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
#define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
+#include <cstdint>
#include <ostream>
#include <string>
#include <vector>
diff --git a/extensions/common/constants.h b/extensions/common/constants.h
index 0f7db327206..284cc878ff8 100644
--- a/extensions/common/constants.h
+++ b/extensions/common/constants.h
@@ -5,6 +5,9 @@
#ifndef EXTENSIONS_COMMON_CONSTANTS_H_
#define EXTENSIONS_COMMON_CONSTANTS_H_
+#include <cstddef>
+#include <cstdint>
+
#include "base/files/file_path.h"
#include "base/strings/string_piece_forward.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/renderer/bindings/api_invocation_errors.h b/extensions/renderer/bindings/api_invocation_errors.h
index e21700ecfc4..3b704e83b06 100644
--- a/extensions/renderer/bindings/api_invocation_errors.h
+++ b/extensions/renderer/bindings/api_invocation_errors.h
@@ -5,6 +5,7 @@
#ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
#define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
+#include <cstdint>
#include <set>
#include <string>
diff --git a/net/base/parse_number.h b/net/base/parse_number.h
index f4827f7a7da..f923b18a7f4 100644
--- a/net/base/parse_number.h
+++ b/net/base/parse_number.h
@@ -5,6 +5,8 @@
#ifndef NET_BASE_PARSE_NUMBER_H_
#define NET_BASE_PARSE_NUMBER_H_
+#include <cstdint>
+
#include "base/strings/string_piece.h"
#include "net/base/net_export.h"
diff --git a/net/cookies/cookie_inclusion_status.h b/net/cookies/cookie_inclusion_status.h
index 51fb970be72..e8dd6d8d9fa 100644
--- a/net/cookies/cookie_inclusion_status.h
+++ b/net/cookies/cookie_inclusion_status.h
@@ -6,6 +6,7 @@
#define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
#include <bitset>
+#include <cstdint>
#include <ostream>
#include <string>
#include <vector>
diff --git a/sandbox/linux/syscall_broker/broker_file_permission.h b/sandbox/linux/syscall_broker/broker_file_permission.h
index 3538da53ca9..e8e32cccd60 100644
--- a/sandbox/linux/syscall_broker/broker_file_permission.h
+++ b/sandbox/linux/syscall_broker/broker_file_permission.h
@@ -6,6 +6,7 @@
#define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
#include <bitset>
+#include <cstdint>
#include <string>
#include "base/strings/string_piece.h"
diff --git a/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h b/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
index 8ab06791464..329c8333cdd 100644
--- a/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
+++ b/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
@@ -8,6 +8,9 @@
#include <stdint.h>
#include <array>
+#include <cstdint>
+#include <functional>
+#include <iosfwd>
#include <string>
#include "third_party/blink/public/common/common_export.h"
diff --git a/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
index c1b5f59f57e..246200991a5 100644
--- a/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
+++ b/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
@@ -6,6 +6,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_
#include <array>
+#include <cstdint>
namespace blink {
diff --git a/ui/gfx/geometry/linear_gradient.h b/ui/gfx/geometry/linear_gradient.h
index d337a7de29b..d327662833f 100644
--- a/ui/gfx/geometry/linear_gradient.h
+++ b/ui/gfx/geometry/linear_gradient.h
@@ -8,6 +8,8 @@
#include <stdint.h>
#include <array>
+#include <cstddef>
+#include <cstdint>
#include <string>
#include "ui/gfx/geometry/geometry_skia_export.h"

View file

@ -0,0 +1,28 @@
From a7423b3d8367a706c50ab787df2fe5eedb6c3c9f Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Mon, 3 Apr 2023 13:51:27 +0000
Subject: [PATCH] IWYU: add cstdint for uint8_t
dawn::native::stream::ByteVectorSink
Bug: chromium:957519
Change-Id: I48436db0e203d793e47d717bfb75977c67145e94
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/126120
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
---
src/dawn/native/stream/ByteVectorSink.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/dawn/native/stream/ByteVectorSink.h b/src/dawn/native/stream/ByteVectorSink.h
index 3b6016c082..5537820b1a 100644
--- a/src/dawn/native/stream/ByteVectorSink.h
+++ b/src/dawn/native/stream/ByteVectorSink.h
@@ -15,6 +15,7 @@
#ifndef SRC_DAWN_NATIVE_STREAM_BYTEVECTORSINK_H_
#define SRC_DAWN_NATIVE_STREAM_BYTEVECTORSINK_H_
+#include <cstdint>
#include <ostream>
#include <vector>

View file

@ -0,0 +1,40 @@
From dbb0a49610aa491c5eaa1461342485721c37354c Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Fri, 14 Apr 2023 05:29:45 +0000
Subject: [PATCH] IWYU: add cstdint for int types in s2cellid
Bug: 957519
Change-Id: I65ad411c605baeaeda3addfd07ea9b565179368b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4418467
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Reviewed-by: Andrew Moylan <amoylan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1130286}
---
third_party/s2cellid/README.chromium | 1 +
third_party/s2cellid/src/s2/util/math/vector.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/third_party/s2cellid/README.chromium b/third_party/s2cellid/README.chromium
index 53c42f7342d..25044e85135 100644
--- a/third_party/s2cellid/README.chromium
+++ b/third_party/s2cellid/README.chromium
@@ -18,6 +18,7 @@ Local Modifications:
- mathutil.h mathutil.cc
- vector.h
- Change comparison operator implementations to be C++20-compliant
+ - add missing cstdint include
- _fpcontractoff.h
- r1interval.h
- r2.h
diff --git a/third_party/s2cellid/src/s2/util/math/vector.h b/third_party/s2cellid/src/s2/util/math/vector.h
index ded669c1d71..487edc3f93b 100644
--- a/third_party/s2cellid/src/s2/util/math/vector.h
+++ b/third_party/s2cellid/src/s2/util/math/vector.h
@@ -22,6 +22,7 @@
#include <algorithm>
#include <cmath>
+#include <cstdint>
#include <cstdlib>
#include <iosfwd>
#include <iostream> // NOLINT(readability/streams)

View file

@ -0,0 +1,28 @@
From 83de2fa6806fc337e61fef0bd156dc2602542db3 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Tue, 4 Apr 2023 16:10:03 +0000
Subject: [PATCH] IWYU: add cstdint for uintptr_t in device::OneWriterSeqLock
Bug: 957519
Change-Id: I283f5b0cc34a268bea5dcb03c34726cbec905ea7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4394541
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Ken Rockot <rockot@google.com>
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#1126023}
---
device/base/synchronization/one_writer_seqlock.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/device/base/synchronization/one_writer_seqlock.h b/device/base/synchronization/one_writer_seqlock.h
index 528b6683ca2..e37a16b81be 100644
--- a/device/base/synchronization/one_writer_seqlock.h
+++ b/device/base/synchronization/one_writer_seqlock.h
@@ -6,6 +6,7 @@
#define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
#include <atomic>
+#include <cstdint>
#include <type_traits>
#include "base/atomicops.h"

View file

@ -0,0 +1,28 @@
From 2a7bf74bdb6348781dd4f3fbe9897969c4e7b819 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Tue, 11 Apr 2023 16:09:29 +0000
Subject: [PATCH] IWYU: add stdint.h for int types in gpu_feature_info
Bug: 957519
Change-Id: Ic3bebb43bcbb3a04876e5fc35767af39b01afdd2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4401097
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Reviewed-by: vikas soni <vikassoni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1128679}
---
gpu/config/gpu_feature_info.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gpu/config/gpu_feature_info.h b/gpu/config/gpu_feature_info.h
index d269ce2d825..45edc112dbc 100644
--- a/gpu/config/gpu_feature_info.h
+++ b/gpu/config/gpu_feature_info.h
@@ -5,6 +5,8 @@
#ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
#define GPU_CONFIG_GPU_FEATURE_INFO_H_
+#include <stdint.h>
+
#include <string>
#include <vector>

View file

@ -0,0 +1,56 @@
From 7815db39abc8ccf64305c5fbac7e0f88bcc8b371 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Wed, 5 Apr 2023 21:14:20 +0000
Subject: [PATCH] IWYU: add stdint.h for integer types in //ui
Bug: 957519
Change-Id: I33698e997a32c36db19775f0cf4b22fb13cee349
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4400997
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1126829}
---
ui/base/prediction/kalman_filter.h | 2 ++
ui/events/types/scroll_types.h | 2 ++
ui/gfx/geometry/linear_gradient.h | 2 ++
3 files changed, 6 insertions(+)
diff --git a/ui/base/prediction/kalman_filter.h b/ui/base/prediction/kalman_filter.h
index bee3f946e9c..88a3eb5e95c 100644
--- a/ui/base/prediction/kalman_filter.h
+++ b/ui/base/prediction/kalman_filter.h
@@ -5,6 +5,8 @@
#ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_
#define UI_BASE_PREDICTION_KALMAN_FILTER_H_
+#include <stdint.h>
+
#include "base/component_export.h"
#include "ui/gfx/geometry/matrix3_f.h"
diff --git a/ui/events/types/scroll_types.h b/ui/events/types/scroll_types.h
index be6b2779f41..aac53c4bea7 100644
--- a/ui/events/types/scroll_types.h
+++ b/ui/events/types/scroll_types.h
@@ -5,6 +5,8 @@
#ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
#define UI_EVENTS_TYPES_SCROLL_TYPES_H_
+#include <stdint.h>
+
namespace ui {
enum class ScrollGranularity : uint8_t {
diff --git a/ui/gfx/geometry/linear_gradient.h b/ui/gfx/geometry/linear_gradient.h
index 65cd4cb07c7..d337a7de29b 100644
--- a/ui/gfx/geometry/linear_gradient.h
+++ b/ui/gfx/geometry/linear_gradient.h
@@ -5,6 +5,8 @@
#ifndef UI_GFX_LINEAR_GRADIENT_H_
#define UI_GFX_LINEAR_GRADIENT_H_
+#include <stdint.h>
+
#include <array>
#include <string>

View file

@ -0,0 +1,28 @@
From e80fc92c8ac9f727486bddeb964206fe7a52fac5 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Mon, 10 Apr 2023 15:44:41 +0000
Subject: [PATCH] IWYU: add stdint.h for uint32_t in cc::TargetProperty
Change-Id: If8b3a9cdf0d310391aeed3abf303e2ea054697b1
Bug: 957519
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4406545
Reviewed-by: Stefan Zager <szager@chromium.org>
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#1128159}
---
cc/trees/target_property.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cc/trees/target_property.cc b/cc/trees/target_property.cc
index f6e873a01a1..7d73467a92f 100644
--- a/cc/trees/target_property.cc
+++ b/cc/trees/target_property.cc
@@ -4,6 +4,8 @@
#include "cc/trees/target_property.h"
+#include <stdint.h>
+
#include "ui/gfx/animation/keyframe/target_property.h"
namespace cc {

View file

@ -0,0 +1,29 @@
From 5ec376a5f7170cbd30727f21bb8185ec915a9893 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Tue, 4 Apr 2023 17:30:49 +0000
Subject: [PATCH] IWYU: add stdint.h for uint32_t in
chrome_pdf::DocumentAttachmentInfo
Bug: 957519
Change-Id: I8efc538b2ae901c7d5076fdf692a31250c16cbbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4395997
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1126091}
---
pdf/document_attachment_info.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pdf/document_attachment_info.h b/pdf/document_attachment_info.h
index e0fffc2ca4e..ad106fdf5e0 100644
--- a/pdf/document_attachment_info.h
+++ b/pdf/document_attachment_info.h
@@ -5,6 +5,8 @@
#ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
#define PDF_DOCUMENT_ATTACHMENT_INFO_H_
+#include <stdint.h>
+
#include <string>

View file

@ -0,0 +1,28 @@
From e920736d83fe9138c72569985fce37d9e0543c91 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Tue, 4 Apr 2023 14:51:19 +0000
Subject: [PATCH] IWYU: add stdint.h for uint64_t in EncounteredSurfaceTracker
Bug: 957519
Change-Id: Id454f688c3067c4755c2c1353f22e0f75643aed9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4396357
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Reviewed-by: Antonio Sartori <antoniosartori@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1125978}
---
chrome/browser/privacy_budget/encountered_surface_tracker.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chrome/browser/privacy_budget/encountered_surface_tracker.h b/chrome/browser/privacy_budget/encountered_surface_tracker.h
index 012ca2c5952..32d0ac6629e 100644
--- a/chrome/browser/privacy_budget/encountered_surface_tracker.h
+++ b/chrome/browser/privacy_budget/encountered_surface_tracker.h
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_PRIVACY_BUDGET_ENCOUNTERED_SURFACE_TRACKER_H_
#define CHROME_BROWSER_PRIVACY_BUDGET_ENCOUNTERED_SURFACE_TRACKER_H_
+#include <stdint.h>
+
#include <map>
#include "base/containers/flat_set.h"

View file

@ -0,0 +1,40 @@
From afbe6c6ee713519263305d7e2d91cc9f1379afe2 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Mon, 3 Apr 2023 20:41:40 +0000
Subject: [PATCH] IWYU: add stdint.h for various int types in //base
Bug: 957519
Change-Id: I750de80f0d27d93ef3383052ddb4eefd5ee13abe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4394430
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#1125558}
---
base/debug/profiler.h | 1 +
base/strings/string_piece.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/base/debug/profiler.h b/base/debug/profiler.h
index 5f0deadd5d3..035affc7c4d 100644
--- a/base/debug/profiler.h
+++ b/base/debug/profiler.h
@@ -6,6 +6,7 @@
#define BASE_DEBUG_PROFILER_H_
#include <stddef.h>
+#include <stdint.h>
#include <string>
diff --git a/base/strings/string_piece.h b/base/strings/string_piece.h
index 899b654cbe8..9dde6ec29bb 100644
--- a/base/strings/string_piece.h
+++ b/base/strings/string_piece.h
@@ -22,6 +22,7 @@
#define BASE_STRINGS_STRING_PIECE_H_
#include <stddef.h>
+#include <stdint.h>
#include <algorithm>
#include <iosfwd>

View file

@ -0,0 +1,111 @@
From 81b275691c28e2a8ae91514305a0e213461fcda4 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Tue, 11 Apr 2023 13:30:43 +0000
Subject: [PATCH] IWYU: add stdint.h for various integer types in //components
Bug: 957519
Change-Id: I920fc7c442b05c3522a6533c4b0ec83b403fd0f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4406547
Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#1128605}
---
components/autofill/core/browser/autofill_ablation_study.h | 2 ++
components/crash/core/app/crash_reporter_client.h | 2 ++
.../feature_engagement/internal/event_storage_validator.h | 2 ++
components/omnibox/browser/on_device_head_model.h | 2 ++
.../core/browser/generation/password_generator.h | 2 ++
components/payments/content/utility/fingerprint_parser.h | 1 +
components/viz/common/view_transition_element_resource_id.h | 2 ++
8 files changed, 15 insertions(+)
diff --git a/components/autofill/core/browser/autofill_ablation_study.h b/components/autofill/core/browser/autofill_ablation_study.h
index ada8121982e..4ddec085621 100644
--- a/components/autofill/core/browser/autofill_ablation_study.h
+++ b/components/autofill/core/browser/autofill_ablation_study.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
+#include <stdint.h>
+
#include <string>
class GURL;
diff --git a/components/crash/core/app/crash_reporter_client.h b/components/crash/core/app/crash_reporter_client.h
index 9f8f20dfa65..a604df7a5ea 100644
--- a/components/crash/core/app/crash_reporter_client.h
+++ b/components/crash/core/app/crash_reporter_client.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
#define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+#include <stdint.h>
+
#include <string>
#include "build/build_config.h"
diff --git a/components/feature_engagement/internal/event_storage_validator.h b/components/feature_engagement/internal/event_storage_validator.h
index 647a359ee24..f3f792205af 100644
--- a/components/feature_engagement/internal/event_storage_validator.h
+++ b/components/feature_engagement/internal/event_storage_validator.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
#define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
+#include <stdint.h>
+
#include <string>
namespace feature_engagement {
diff --git a/components/omnibox/browser/on_device_head_model.h b/components/omnibox/browser/on_device_head_model.h
index d51277918cf..3a6039ffd33 100644
--- a/components/omnibox/browser/on_device_head_model.h
+++ b/components/omnibox/browser/on_device_head_model.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_
#define COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_
+#include <stdint.h>
+
#include <string>
#include <utility>
#include <vector>
diff --git a/components/password_manager/core/browser/generation/password_generator.h b/components/password_manager/core/browser/generation/password_generator.h
index b0d621ce35f..683dd668888 100644
--- a/components/password_manager/core/browser/generation/password_generator.h
+++ b/components/password_manager/core/browser/generation/password_generator.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
+#include <stdint.h>
+
#include <string>
diff --git a/components/payments/content/utility/fingerprint_parser.h b/components/payments/content/utility/fingerprint_parser.h
index e7983056517..3c3f8308700 100644
--- a/components/payments/content/utility/fingerprint_parser.h
+++ b/components/payments/content/utility/fingerprint_parser.h
@@ -6,6 +6,7 @@
#define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_
#include <stddef.h>
+#include <stdint.h>
#include <string>
#include <vector>
diff --git a/components/viz/common/view_transition_element_resource_id.h b/components/viz/common/view_transition_element_resource_id.h
index fd0d06b16d6..17ae5688877 100644
--- a/components/viz/common/view_transition_element_resource_id.h
+++ b/components/viz/common/view_transition_element_resource_id.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
#define COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
+#include <stdint.h>
+
#include <string>
#include <vector>

View file

@ -0,0 +1,43 @@
From 78e8aa30665d0344a64a98c092612ea6064dbe60 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Wed, 12 Apr 2023 08:42:20 +0000
Subject: [PATCH] IWYU: add stdint.h for various integer types in //net
Bug: 957519
Change-Id: I7161bc8f5974a4d241c12d618d954db0787ab84c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4394856
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Reviewed-by: Steven Bingler <bingler@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1129139}
---
net/cert/pki/string_util.h | 2 ++
net/cookies/cookie_inclusion_status.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/net/cert/pki/string_util.h b/net/cert/pki/string_util.h
index 1687b088606..b18f716f4b2 100644
--- a/net/cert/pki/string_util.h
+++ b/net/cert/pki/string_util.h
@@ -7,6 +7,8 @@
#include "net/base/net_export.h"
+#include <stdint.h>
+
#include <string_view>
#include <vector>
diff --git a/net/cookies/cookie_inclusion_status.h b/net/cookies/cookie_inclusion_status.h
index e8dd6d8d9fa..129b13ab7ba 100644
--- a/net/cookies/cookie_inclusion_status.h
+++ b/net/cookies/cookie_inclusion_status.h
@@ -5,6 +5,8 @@
#ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
#define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
+#include <stdint.h>
+
#include <bitset>
#include <cstdint>
#include <ostream>

View file

@ -0,0 +1,51 @@
From f8d65c61edd2ba483f1f6167c8a5fe5ad53254ea Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Wed, 5 Apr 2023 18:53:56 +0200
Subject: [PATCH] IWYU: add stdint.h for various integer types
Bug: chromium:957519
Change-Id: If28a50f5b1c68fffd1ba546dea18b4d906a42bbf
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/4403253
Reviewed-by: Mark Foltz <mfoltz@chromium.org>
Commit-Queue: Mark Foltz <mfoltz@chromium.org>
---
AUTHORS | 1 +
discovery/dnssd/public/dns_sd_txt_record.h | 2 ++
util/base64.h | 2 ++
3 files changed, 5 insertions(+)
diff --git a/AUTHORS b/AUTHORS
index 768523fc..4e9e5667 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,3 +5,4 @@ Peter Thatcher <pthatcher@chromium.org>
Jordan Bayles <jophba@chromium.org>
Max Yakimakha <yakimakha@chromium.org>
Ryan Keane <rwkeane@google.com>
+Stephan Hartmann <stha09@googlemail.com>
diff --git a/discovery/dnssd/public/dns_sd_txt_record.h b/discovery/dnssd/public/dns_sd_txt_record.h
index edf2c782..c9b5c436 100644
--- a/discovery/dnssd/public/dns_sd_txt_record.h
+++ b/discovery/dnssd/public/dns_sd_txt_record.h
@@ -5,6 +5,8 @@
#ifndef DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
#define DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
+#include <stdint.h>
+
#include <functional>
#include <map>
#include <set>
diff --git a/util/base64.h b/util/base64.h
index a7af9eca..86261936 100644
--- a/util/base64.h
+++ b/util/base64.h
@@ -5,6 +5,8 @@
#ifndef UTIL_BASE64_H_
#define UTIL_BASE64_H_
+#include <stdint.h>
+
#include <string>
#include <vector>

View file

@ -0,0 +1,27 @@
From 5d9acaac1abbbe45558f2bd6cbd3b3e9efde4414 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Wed, 5 Apr 2023 16:10:25 +0000
Subject: [PATCH] IWYU: add stdint.h for uint32_t pdfium::annotation_flags
Bug: chromium:957519
Change-Id: Id10921a5fdf93a3b92c76c84266696e92d901bd5
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/105890
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
---
constants/annotation_flags.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/constants/annotation_flags.h b/constants/annotation_flags.h
index 2ac244e06..d44a0c13c 100644
--- a/constants/annotation_flags.h
+++ b/constants/annotation_flags.h
@@ -5,6 +5,8 @@
#ifndef CONSTANTS_ANNOTATION_FLAGS_H_
#define CONSTANTS_ANNOTATION_FLAGS_H_
+#include <stdint.h>
+
namespace pdfium {
namespace annotation_flags {

View file

@ -0,0 +1,75 @@
diff -upr chromium-113.0.5672.63.orig/gin/time_clamper.h chromium-113.0.5672.63/gin/time_clamper.h
--- chromium-113.0.5672.63.orig/gin/time_clamper.h 2023-04-26 21:43:06.707860200 +0000
+++ chromium-113.0.5672.63/gin/time_clamper.h 2023-05-09 00:14:09.744221610 +0000
@@ -6,6 +6,7 @@
#define GIN_TIME_CLAMPER_H_
#include <algorithm>
+#include <cstdlib>
#include "base/rand_util.h"
#include "base/time/time.h"
@@ -48,7 +49,7 @@ class GIN_EXPORT TimeClamper {
const int64_t micros = now_micros % 1000;
// abs() is necessary for devices with times before unix-epoch (most likely
// configured incorrectly).
- if (abs(micros) + kResolutionMicros < 1000) {
+ if (std::abs(micros) + kResolutionMicros < 1000) {
return now_micros / 1000;
}
return ClampTimeResolution(now_micros) / 1000;
diff -upr chromium-113.0.5672.63.orig/third_party/maldoca/src/maldoca/ole/header.h chromium-113.0.5672.63/third_party/maldoca/src/maldoca/ole/header.h
--- chromium-113.0.5672.63.orig/third_party/maldoca/src/maldoca/ole/header.h 2023-04-26 21:43:58.708449600 +0000
+++ chromium-113.0.5672.63/third_party/maldoca/src/maldoca/ole/header.h 2023-05-09 00:14:09.744221610 +0000
@@ -43,6 +43,7 @@
#ifndef MALDOCA_OLE_HEADER_H_
#define MALDOCA_OLE_HEADER_H_
+#include <cstdint>
#include "absl/strings/string_view.h"
namespace maldoca {
diff -upr chromium-113.0.5672.63.orig/third_party/ruy/src/ruy/profiler/instrumentation.h chromium-113.0.5672.63/third_party/ruy/src/ruy/profiler/instrumentation.h
--- chromium-113.0.5672.63.orig/third_party/ruy/src/ruy/profiler/instrumentation.h 2023-04-26 21:47:36.527673200 +0000
+++ chromium-113.0.5672.63/third_party/ruy/src/ruy/profiler/instrumentation.h 2023-05-09 00:14:09.744221610 +0000
@@ -19,6 +19,7 @@ limitations under the License.
#ifdef RUY_PROFILER
#include <cstdio>
#include <mutex>
+#include <string>
#include <vector>
#endif
diff -upr chromium-113.0.5672.63.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc chromium-113.0.5672.63/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc
--- chromium-113.0.5672.63.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc 2023-04-26 21:47:39.531938300 +0000
+++ chromium-113.0.5672.63/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc 2023-05-09 00:14:09.747555160 +0000
@@ -17,6 +17,7 @@ limitations under the License.
#include <assert.h>
#include <math.h>
+#include <stdint.h>
#include "third_party/fft2d/fft.h"
diff -upr chromium-113.0.5672.63.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h chromium-113.0.5672.63/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
--- chromium-113.0.5672.63.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h 2023-04-26 21:47:38.323831800 +0000
+++ chromium-113.0.5672.63/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h 2023-05-09 00:14:09.757555808 +0000
@@ -2579,6 +2579,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeS
#undef VMA_IMPLEMENTATION
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <utility>
diff -upr chromium-113.0.5672.63.orig/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h chromium-113.0.5672.63/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
--- chromium-113.0.5672.63.orig/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h 2023-04-26 21:47:36.679686500 +0000
+++ chromium-113.0.5672.63/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h 2023-05-09 00:14:41.046248921 +0000
@@ -2389,6 +2389,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeV
#undef VMA_IMPLEMENTATION
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <utility>

View file

@ -0,0 +1,28 @@
From 3ecab9c1aa60d548d8efeae3a231f4df7cca6cc7 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Sun, 2 Apr 2023 20:53:20 +0200
Subject: [PATCH] IWYU: add cstdint for uint64_t in sw::LRUCache
Bug: chromium:957519
Change-Id: I70970ceda50dfc38f3d149fea03e8a6a79a35934
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71268
Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Shahbaz Youssefi <syoussefi@google.com>
---
src/System/LRUCache.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/System/LRUCache.hpp b/src/System/LRUCache.hpp
index 1c244906441..a04cdfafbc0 100644
--- a/src/System/LRUCache.hpp
+++ b/src/System/LRUCache.hpp
@@ -18,6 +18,7 @@
#include "System/Debug.hpp"
#include <cstddef>
+#include <cstdint>
#include <functional>
#include <unordered_set>
#include <vector>

View file

@ -0,0 +1,44 @@
From c8b965be5b61c2412df938e1feb380b69bd92ee9 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Thu, 6 Apr 2023 07:15:03 +0000
Subject: [PATCH] [unbundle] do not use ZipAnalyzer traits header
It is enough to include chrome/common/safe_browsing/archive_analyzer_results.h.
Bug: None
Change-Id: Ia63a66b77c073fa4fdb8470db34b4c24722293cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4373706
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#1127041}
---
chrome/services/file_util/public/mojom/BUILD.gn | 3 ++-
chrome/services/file_util/safe_archive_analyzer.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/chrome/services/file_util/public/mojom/BUILD.gn b/chrome/services/file_util/public/mojom/BUILD.gn
index b9e80cc748e..461d2d00b5e 100644
--- a/chrome/services/file_util/public/mojom/BUILD.gn
+++ b/chrome/services/file_util/public/mojom/BUILD.gn
@@ -55,7 +55,8 @@ mojom("mojom") {
cpp = "::safe_browsing::ArchiveAnalyzerResults"
},
]
- traits_headers = [ "//chrome/common/safe_browsing/zip_analyzer.h" ]
+ traits_headers =
+ [ "//chrome/common/safe_browsing/archive_analyzer_results.h" ]
traits_private_headers = [ "safe_archive_analyzer_param_traits.h" ]
traits_public_deps = [
"//chrome/common/safe_browsing:proto",
diff --git a/chrome/services/file_util/safe_archive_analyzer.h b/chrome/services/file_util/safe_archive_analyzer.h
index 62307b87839..0231205377c 100644
--- a/chrome/services/file_util/safe_archive_analyzer.h
+++ b/chrome/services/file_util/safe_archive_analyzer.h
@@ -7,6 +7,7 @@
#include "chrome/common/safe_browsing/archive_analyzer_results.h"
#include "chrome/common/safe_browsing/rar_analyzer.h"
+#include "chrome/common/safe_browsing/zip_analyzer.h"
#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"