Update to Chromium version 121.0.6167.0 (#1233107)

This commit is contained in:
Marshall Greenblatt
2023-12-06 15:16:15 -05:00
parent 2f0b00f8f5
commit 80c65f25a3
122 changed files with 1044 additions and 986 deletions

View File

@ -1,8 +1,8 @@
diff --git sandbox/win/src/sandbox_policy.h sandbox/win/src/sandbox_policy.h
index ef4c6f3affaaf..b14d571ddb2dd 100644
index 57409176ff044..58bb027580bbb 100644
--- sandbox/win/src/sandbox_policy.h
+++ sandbox/win/src/sandbox_policy.h
@@ -282,7 +282,7 @@ class [[clang::lto_visibility_public]] TargetPolicy {
@@ -275,7 +275,7 @@ class [[clang::lto_visibility_public]] TargetPolicy {
// Adds a blob of data that will be made available in the child early in
// startup via sandbox::GetDelegateData(). The contents of this data should
// not vary between children with the same TargetConfig().
@ -12,15 +12,15 @@ index ef4c6f3affaaf..b14d571ddb2dd 100644
} // namespace sandbox
diff --git sandbox/win/src/sandbox_policy_base.cc sandbox/win/src/sandbox_policy_base.cc
index 4151077e469b3..c3f280aea7789 100644
index f54b6c9d83627..3a513f05e851e 100644
--- sandbox/win/src/sandbox_policy_base.cc
+++ sandbox/win/src/sandbox_policy_base.cc
@@ -190,12 +190,12 @@ PolicyGlobal* ConfigBase::policy() {
@@ -189,12 +189,12 @@ PolicyGlobal* ConfigBase::policy() {
return policy_;
}
-absl::optional<base::span<const uint8_t>> ConfigBase::policy_span() {
+absl::optional<base::span<uint8_t>> ConfigBase::policy_span() {
-std::optional<base::span<const uint8_t>> ConfigBase::policy_span() {
+std::optional<base::span<uint8_t>> ConfigBase::policy_span() {
if (policy_) {
// Note: this is not policy().data_size as that relates to internal data,
// not the entire allocated policy area.
@ -29,18 +29,18 @@ index 4151077e469b3..c3f280aea7789 100644
+ return base::span<uint8_t>(reinterpret_cast<uint8_t*>(policy_.get()),
+ kPolMemSize);
}
return absl::nullopt;
return std::nullopt;
}
@@ -760,19 +760,19 @@ bool PolicyBase::SetupHandleCloser(TargetProcess& target) {
@@ -751,19 +751,19 @@ bool PolicyBase::SetupHandleCloser(TargetProcess& target) {
return handle_closer->InitializeTargetHandles(target);
}
-absl::optional<base::span<const uint8_t>> PolicyBase::delegate_data_span() {
+absl::optional<base::span<uint8_t>> PolicyBase::delegate_data_span() {
-std::optional<base::span<const uint8_t>> PolicyBase::delegate_data_span() {
+std::optional<base::span<uint8_t>> PolicyBase::delegate_data_span() {
if (delegate_data_) {
return base::make_span(*delegate_data_);
}
return absl::nullopt;
return std::nullopt;
}
-void PolicyBase::AddDelegateData(base::span<const uint8_t> data) {
@ -55,19 +55,19 @@ index 4151077e469b3..c3f280aea7789 100644
} // namespace sandbox
diff --git sandbox/win/src/sandbox_policy_base.h sandbox/win/src/sandbox_policy_base.h
index 22f872d70e2c8..fcf3ed3e75857 100644
index 090d51f701614..fb2aedd4aa0ec 100644
--- sandbox/win/src/sandbox_policy_base.h
+++ sandbox/win/src/sandbox_policy_base.h
@@ -117,7 +117,7 @@ class ConfigBase final : public TargetConfig {
@@ -116,7 +116,7 @@ class ConfigBase final : public TargetConfig {
// Should only be called once the object is configured.
PolicyGlobal* policy();
- absl::optional<base::span<const uint8_t>> policy_span();
+ absl::optional<base::span<uint8_t>> policy_span();
- std::optional<base::span<const uint8_t>> policy_span();
+ std::optional<base::span<uint8_t>> policy_span();
std::vector<std::wstring>& blocklisted_dlls();
AppContainerBase* app_container();
IntegrityLevel integrity_level() { return integrity_level_; }
@@ -177,7 +177,7 @@ class PolicyBase final : public TargetPolicy {
@@ -176,7 +176,7 @@ class PolicyBase final : public TargetPolicy {
ResultCode SetStdoutHandle(HANDLE handle) override;
ResultCode SetStderrHandle(HANDLE handle) override;
void AddHandleToShare(HANDLE handle) override;
@ -76,12 +76,12 @@ index 22f872d70e2c8..fcf3ed3e75857 100644
// Creates a Job object with the level specified in a previous call to
// SetJobLevel().
@@ -239,13 +239,13 @@ class PolicyBase final : public TargetPolicy {
@@ -238,13 +238,13 @@ class PolicyBase final : public TargetPolicy {
// time.
// Returns nullopt if no data has been set, or a view into the data.
- absl::optional<base::span<const uint8_t>> delegate_data_span();
+ absl::optional<base::span<uint8_t>> delegate_data_span();
- std::optional<base::span<const uint8_t>> delegate_data_span();
+ std::optional<base::span<uint8_t>> delegate_data_span();
// The user-defined global policy settings.
HANDLE stdout_handle_;