diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch
index c1ea588a..40a0ef0a 100644
--- a/build/patches/AImageReader-CFI-crash-mitigations.patch
+++ b/build/patches/AImageReader-CFI-crash-mitigations.patch
@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
-@@ -3401,6 +3401,10 @@
+@@ -3408,6 +3408,10 @@
"name": "enable-identity-in-auth-error",
"owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],
"expiry_milestone": 135
diff --git a/build/patches/Add-a-flag-to-disable-GamePad-API.patch b/build/patches/Add-a-flag-to-disable-GamePad-API.patch
index 00d3d541..fb01fe03 100644
--- a/build/patches/Add-a-flag-to-disable-GamePad-API.patch
+++ b/build/patches/Add-a-flag-to-disable-GamePad-API.patch
@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
-@@ -7800,9 +7800,9 @@
+@@ -7807,9 +7807,9 @@
"expiry_milestone" : 130
},
{
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -3321,7 +3321,7 @@ const char kResetShortcutCustomizationsDescription[] =
+@@ -3331,7 +3331,7 @@ const char kResetShortcutCustomizationsDescription[] =
const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
const char kRestrictGamepadAccessDescription[] =
diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch
index 6f922623..da84b32c 100644
--- a/build/patches/Add-bookmark-import-export-actions.patch
+++ b/build/patches/Add-bookmark-import-export-actions.patch
@@ -823,7 +823,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"bookmarks/chrome_bookmark_client.cc",
"bookmarks/chrome_bookmark_client.h",
"bookmarks/managed_bookmark_service_factory.cc",
-@@ -1704,6 +1706,13 @@ static_library("browser") {
+@@ -1707,6 +1709,13 @@ static_library("browser") {
"webid/identity_provider_permission_request.h",
]
@@ -837,7 +837,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config:precompiled_headers",
-@@ -3505,8 +3514,6 @@ static_library("browser") {
+@@ -3508,8 +3517,6 @@ static_library("browser") {
"bookmarks/bookmark_expanded_state_tracker.h",
"bookmarks/bookmark_expanded_state_tracker_factory.cc",
"bookmarks/bookmark_expanded_state_tracker_factory.h",
diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch
index 34621303..c647b6fa 100644
--- a/build/patches/Add-cromite-flags-support.patch
+++ b/build/patches/Add-cromite-flags-support.patch
@@ -1911,7 +1911,7 @@ diff --git a/net/base/features.h b/net/base/features.h
diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
-@@ -489,4 +489,5 @@ BASE_FEATURE(kStorageAccessHeadersTrial,
+@@ -515,4 +515,5 @@ BASE_FEATURE(kStorageAccessHeadersTrial,
"StorageAccessHeadersTrial",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1920,7 +1920,7 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
--- a/services/network/public/cpp/features.h
+++ b/services/network/public/cpp/features.h
-@@ -195,6 +195,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kStorageAccessHeaders);
+@@ -204,6 +204,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kStorageAccessHeaders);
// Enables the Storage Access Headers Origin Trial.
COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kStorageAccessHeadersTrial);
diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch
index 50a99137..6ea30ba6 100644
--- a/build/patches/Add-flag-to-disable-IPv6-probes.patch
+++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch
@@ -45,7 +45,7 @@ new file mode 100644
diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
-@@ -1099,6 +1099,7 @@ component("net") {
+@@ -1101,6 +1101,7 @@ component("net") {
"//components/miracle_parameter/common",
"//components/network_time/time_tracker",
"//net/http:transport_security_state_generated_files",
diff --git a/build/patches/Add-support-to-jxl.patch b/build/patches/Add-support-to-jxl.patch
index 88227d35..6033c0f7 100644
--- a/build/patches/Add-support-to-jxl.patch
+++ b/build/patches/Add-support-to-jxl.patch
@@ -2215,7 +2215,7 @@ diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/bli
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
-@@ -4837,6 +4837,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
+@@ -4851,6 +4851,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
# Started failing after rolling new version of check-layout-th.js
css3/flexbox/perpendicular-writing-modes-inside-flex-item.html [ Failure ]
@@ -2231,7 +2231,7 @@ diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/we
diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites
--- a/third_party/blink/web_tests/VirtualTestSuites
+++ b/third_party/blink/web_tests/VirtualTestSuites
-@@ -471,6 +471,15 @@
+@@ -489,6 +489,15 @@
"args": ["--enable-blink-features=FractionalScrollOffsets"],
"expires": "Jun 1, 2025"
},
@@ -2646,7 +2646,7 @@ new file mode 100644
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
-@@ -20744,6 +20744,7 @@ from previous Chrome versions.
+@@ -20745,6 +20745,7 @@ from previous Chrome versions.
diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch
index f0f91b25..a0f84289 100644
--- a/build/patches/Block-qjz9zk-or-trk-requests.patch
+++ b/build/patches/Block-qjz9zk-or-trk-requests.patch
@@ -118,7 +118,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
-@@ -1065,6 +1065,8 @@ component("net") {
+@@ -1067,6 +1067,8 @@ component("net") {
"url_request/url_request_http_job.cc",
"url_request/url_request_http_job.h",
"url_request/url_request_interceptor.cc",
diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch
index fa9dee58..1e1ce4f2 100644
--- a/build/patches/Bromite-auto-updater.patch
+++ b/build/patches/Bromite-auto-updater.patch
@@ -672,7 +672,7 @@ new file mode 100644
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
-@@ -2517,6 +2517,12 @@ static_library("browser") {
+@@ -2520,6 +2520,12 @@ static_library("browser") {
}
if (is_android) {
diff --git a/build/patches/Cromite-Branding.patch b/build/patches/Cromite-Branding.patch
index c0552253..7ab60598 100644
--- a/build/patches/Cromite-Branding.patch
+++ b/build/patches/Cromite-Branding.patch
@@ -13153,7 +13153,7 @@ e)fqMZZ`3a)Ds&5HCompleteURL(
- StripLeadingAndTrailingHTMLSpaces(image_candidates[i]->Url()));
+@@ -420,7 +420,8 @@ static unsigned AvoidDownloadIfHigherDensityResourceIsInCache(
auto* resource = MemoryCache::Get()->ResourceForURL(
-- url, document->Fetcher()->GetCacheIdentifier(url));
-+ url, document->Fetcher()->GetCacheIdentifier(url, document->TopFrameOrigin()));
+ url,
+ document->Fetcher()->GetCacheIdentifier(url,
+- /*skip_service_worker=*/false));
++ /*skip_service_worker=*/false,
++ document->TopFrameOrigin()));
if ((resource && resource->IsLoaded()) || url.ProtocolIsData()) {
return i;
}
diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
--- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
-@@ -2440,7 +2440,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document,
- Resource* cached_resource = document->Fetcher()->CachedResource(url);
+@@ -2441,7 +2441,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document,
if (!cached_resource) {
cached_resource = MemoryCache::Get()->ResourceForURL(
-- url, document->Fetcher()->GetCacheIdentifier(url));
-+ url, document->Fetcher()->GetCacheIdentifier(url, document->TopFrameOrigin()));
+ url, document->Fetcher()->GetCacheIdentifier(
+- url, /*skip_service_worker=*/false));
++ url, /*skip_service_worker=*/false, document->TopFrameOrigin()));
}
if (cached_resource && InspectorPageAgent::CachedResourceContent(
cached_resource, content, base64_encoded)) {
diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
--- a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
-@@ -171,9 +171,9 @@ Resource* CachedResource(LocalFrame* frame,
- if (!document)
- return nullptr;
- Resource* cached_resource = document->Fetcher()->CachedResource(url);
-- if (!cached_resource) {
-+ if (!cached_resource && document->TopFrameOrigin()) {
+@@ -174,7 +174,7 @@ Resource* CachedResource(LocalFrame* frame,
+ if (!cached_resource) {
cached_resource = MemoryCache::Get()->ResourceForURL(
-- url, document->Fetcher()->GetCacheIdentifier(url));
-+ url, document->Fetcher()->GetCacheIdentifier(url, document->TopFrameOrigin()));
+ url, document->Fetcher()->GetCacheIdentifier(
+- url, /*skip_service_worker=*/false));
++ url, /*skip_service_worker=*/false, document->TopFrameOrigin()));
}
if (!cached_resource)
cached_resource = loader->ResourceForURL(url);
@@ -80,13 +78,13 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_party/blink/renderer/core/loader/image_loader.cc
--- a/third_party/blink/renderer/core/loader/image_loader.cc
+++ b/third_party/blink/renderer/core/loader/image_loader.cc
-@@ -709,7 +709,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const {
- // content when style recalc is over and DOM mutation is allowed again.
+@@ -710,7 +710,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const {
if (!url.IsNull()) {
Resource* resource = MemoryCache::Get()->ResourceForURL(
-- url, element_->GetDocument().Fetcher()->GetCacheIdentifier(url));
-+ url, element_->GetDocument().Fetcher()->GetCacheIdentifier(url,
-+ element_->GetDocument().TopFrameOrigin()));
+ url, element_->GetDocument().Fetcher()->GetCacheIdentifier(
+- url, /*skip_service_worker=*/false));
++ url, /*skip_service_worker=*/false,
++ element_->GetDocument().TopFrameOrigin()));
if (resource && !resource->ErrorOccurred() &&
CanReuseFromListOfAvailableImages(
@@ -156,45 +154,52 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/t
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
-@@ -992,7 +992,7 @@ Resource* ResourceFetcher::CreateResourceForStaticData(
- if (!archive_ && factory.GetType() == ResourceType::kRaw)
+@@ -993,7 +993,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData(
return nullptr;
-- const String cache_identifier = GetCacheIdentifier(url);
-+ const String cache_identifier = GetCacheIdentifier(url, params.GetResourceRequest());
+ const String cache_identifier = GetCacheIdentifier(
+- url, params.GetResourceRequest().GetSkipServiceWorker());
++ url, params.GetResourceRequest().GetSkipServiceWorker(),
++ params.GetResourceRequest());
// Most off-main-thread resource fetches use Resource::kRaw and don't reach
// this point, but off-main-thread module fetches might.
if (IsMainThread()) {
-@@ -1408,7 +1408,8 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params,
- MakePreloadedResourceBlockOnloadIfNeeded(resource, params);
- } else if (IsMainThread()) {
- resource = MemoryCache::Get()->ResourceForURL(
-- params.Url(), GetCacheIdentifier(params.Url()));
-+ params.Url(),
-+ GetCacheIdentifier(params.Url(), params.GetResourceRequest()));
+@@ -1412,7 +1413,8 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params,
+ params.Url(),
+ GetCacheIdentifier(
+ params.Url(),
+- params.GetResourceRequest().GetSkipServiceWorker()));
++ params.GetResourceRequest().GetSkipServiceWorker(),
++ params.GetResourceRequest()));
if (resource) {
policy = DetermineRevalidationPolicy(resource_type, params, *resource,
is_static_data);
-@@ -1719,7 +1720,8 @@ Resource* ResourceFetcher::CreateResourceForLoading(
- const FetchParameters& params,
+@@ -1724,7 +1726,8 @@ Resource* ResourceFetcher::CreateResourceForLoading(
const ResourceFactory& factory) {
const String cache_identifier =
-- GetCacheIdentifier(params.GetResourceRequest().Url());
-+ GetCacheIdentifier(params.GetResourceRequest().Url(),
-+ params.GetResourceRequest());
+ GetCacheIdentifier(params.GetResourceRequest().Url(),
+- params.GetResourceRequest().GetSkipServiceWorker());
++ params.GetResourceRequest().GetSkipServiceWorker(),
++ params.GetResourceRequest());
DCHECK(!IsMainThread() || params.IsStaleRevalidation() ||
!MemoryCache::Get()->ResourceForURL(params.GetResourceRequest().Url(),
cache_identifier));
-@@ -2788,10 +2790,37 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() {
- to_be_removed.clear();
+@@ -2794,11 +2797,41 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() {
}
--String ResourceFetcher::GetCacheIdentifier(const KURL& url) const {
-+String ResourceFetcher::GetCacheIdentifier(const KURL& url,
-+ const ResourceRequest& resource_request) const {
-+ if (const scoped_refptr top_origin = resource_request.TopFrameOrigin()) {
+ String ResourceFetcher::GetCacheIdentifier(const KURL& url,
+- bool skip_service_worker) const {
+- if (!skip_service_worker &&
+- properties_->GetControllerServiceWorkerMode() !=
+- mojom::ControllerServiceWorkerMode::kNoController) {
+- return String::Number(properties_->ServiceWorkerId());
++ bool skip_service_worker,
++ const ResourceRequest& resource_request) const {
++ if (const scoped_refptr top_origin =
++ resource_request.TopFrameOrigin()) {
+ String origin_url = top_origin ? top_origin->ToRawString() : "";
-+ String cache_identifier = ResourceFetcher::GetCacheIdentifier(url, origin_url);
++ String cache_identifier = ResourceFetcher::GetCacheIdentifier(
++ url, skip_service_worker, origin_url);
+ // LOG(INFO) << "---t (" << cache_identifier << ") " << url.GetString() << "='" << origin_url << "'";
+ return cache_identifier;
+ }
@@ -211,21 +216,22 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
+}
+
+String ResourceFetcher::GetCacheIdentifier(const KURL& url,
-+ scoped_refptr origin) const {
++ bool skip_service_worker,
++ scoped_refptr origin) const {
+ String origin_url = origin ? origin->ToRawString() : "";
-+ return ResourceFetcher::GetCacheIdentifier(url, origin_url);
++ return ResourceFetcher::GetCacheIdentifier(url, skip_service_worker, origin_url);
+}
+
+String ResourceFetcher::GetCacheIdentifier(const KURL& url,
-+ const String origin_url) const {
- if (properties_->GetControllerServiceWorkerMode() !=
- mojom::ControllerServiceWorkerMode::kNoController) {
-- return String::Number(properties_->ServiceWorkerId());
++ bool skip_service_worker,
++ const String origin_url) const {
++ if (!skip_service_worker && properties_->GetControllerServiceWorkerMode() !=
++ mojom::ControllerServiceWorkerMode::kNoController) {
+ return origin_url + " " + String::Number(properties_->ServiceWorkerId());
}
// Requests that can be satisfied via `archive_` (i.e. MHTML) or
-@@ -2804,7 +2833,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const {
+@@ -2811,7 +2844,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url,
if (bundle)
return bundle->GetCacheIdentifier();
@@ -237,17 +243,19 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
-@@ -278,7 +278,12 @@ class PLATFORM_EXPORT ResourceFetcher
- uint32_t inflight_keepalive_bytes);
- blink::mojom::ControllerServiceWorkerMode IsControlledByServiceWorker() const;
-
-- String GetCacheIdentifier(const KURL& url) const;
-+ String GetCacheIdentifier(const KURL& url,
+@@ -282,7 +282,14 @@ class PLATFORM_EXPORT ResourceFetcher
+ // `url` is used for finding a matching WebBundle.
+ // If `skip_service_worker` is true, the identifier won't be a ServiceWorker's
+ // identifier to keep the cache separated.
+- String GetCacheIdentifier(const KURL& url, bool skip_service_worker) const;
++ String GetCacheIdentifier(const KURL& url, bool skip_service_worker,
+ const ResourceRequest& resource_request) const;
-+ String GetCacheIdentifier(const KURL& url,
++ String GetCacheIdentifier(const KURL& url, bool skip_service_worker,
+ scoped_refptr origin) const;
-+ String GetCacheIdentifier(const KURL& url,
++ String GetCacheIdentifier(const KURL& url, bool skip_service_worker,
+ const String origin_url) const;
++
++ blink::mojom::ControllerServiceWorkerMode IsControlledByServiceWorker() const;
// If `url` exists as a resource in a subresource bundle in this frame,
// returns its UnguessableToken; otherwise, returns std::nullopt.
diff --git a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
index 3f1a0850..5c12eaae 100644
--- a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
+++ b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
@@ -634,7 +634,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
--- a/services/network/public/cpp/resource_request.h
+++ b/services/network/public/cpp/resource_request.h
-@@ -146,7 +146,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
+@@ -148,7 +148,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
std::vector navigation_redirect_chain;
GURL referrer;
diff --git a/build/patches/Restore-LastTabStandingTracker.patch b/build/patches/Restore-LastTabStandingTracker.patch
index 3bd76bef..086da828 100644
--- a/build/patches/Restore-LastTabStandingTracker.patch
+++ b/build/patches/Restore-LastTabStandingTracker.patch
@@ -27,7 +27,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
-@@ -1704,6 +1704,16 @@ static_library("browser") {
+@@ -1707,6 +1707,16 @@ static_library("browser") {
"webid/identity_provider_permission_request.h",
]
diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
index 13e253a9..48eb25c7 100644
--- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
+++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
-@@ -2197,6 +2197,10 @@
+@@ -2204,6 +2204,10 @@
"yangsharon@google.com", "alexmos@google.com", "creis@google.com" ],
"expiry_milestone": 140
},
diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch
index 9323a0e6..63abad12 100644
--- a/build/patches/Site-setting-for-images.patch
+++ b/build/patches/Site-setting-for-images.patch
@@ -459,7 +459,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
allow_stale_resources_(false),
image_fetched_(false),
transparent_image_optimization_enabled_(base::FeatureList::IsEnabled(
-@@ -1918,7 +1919,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused(
+@@ -1924,7 +1925,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused(
if (existing_resource.GetType() != ResourceType::kImage)
return false;
@@ -468,7 +468,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
}
ResourceFetcher::RevalidationPolicy
-@@ -2161,8 +2162,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) {
+@@ -2167,8 +2168,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) {
ReloadImagesIfNotDeferred();
}
@@ -501,7 +501,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
FetchContext& Context() const;
void ClearContext();
-@@ -690,6 +691,7 @@ class PLATFORM_EXPORT ResourceFetcher
+@@ -696,6 +697,7 @@ class PLATFORM_EXPORT ResourceFetcher
// 27 bits left
bool auto_load_images_ : 1;
diff --git a/build/patches/eyeo-beta-118.0.5993.48-android_api.patch b/build/patches/eyeo-beta-118.0.5993.48-android_api.patch
index ac73fab3..b7834891 100644
--- a/build/patches/eyeo-beta-118.0.5993.48-android_api.patch
+++ b/build/patches/eyeo-beta-118.0.5993.48-android_api.patch
@@ -132,7 +132,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
-@@ -2553,6 +2553,18 @@ static_library("browser") {
+@@ -2556,6 +2556,18 @@ static_library("browser") {
}
if (is_android) {
diff --git a/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch b/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
index c90551cc..0d430a57 100644
--- a/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
+++ b/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
@@ -159,7 +159,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"after_startup_task_utils.cc",
"after_startup_task_utils.h",
"app_mode/app_mode_utils.cc",
-@@ -1994,6 +2017,9 @@ static_library("browser") {
+@@ -1997,6 +2020,9 @@ static_library("browser") {
"//chrome/common/notifications",
"//chrome/installer/util:with_no_strings",
"//chrome/services/speech/buildflags",
diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch
index 637d27ac..ea89ee55 100644
--- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch
+++ b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
-@@ -1286,8 +1286,6 @@ static_library("browser") {
+@@ -1289,8 +1289,6 @@ static_library("browser") {
"profiles/keep_alive/scoped_profile_keep_alive.h",
"profiles/off_the_record_profile_impl.cc",
"profiles/off_the_record_profile_impl.h",
diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch
index 9481fb24..90ba1d73 100644
--- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch
@@ -115,7 +115,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"page_load_metrics/observers/histogram_suffixes.cc",
"page_load_metrics/observers/histogram_suffixes.h",
"page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.cc",
-@@ -1549,8 +1541,6 @@ static_library("browser") {
+@@ -1552,8 +1544,6 @@ static_library("browser") {
"supervised_user/classify_url_navigation_throttle.h",
"supervised_user/supervised_user_browser_utils.cc",
"supervised_user/supervised_user_browser_utils.h",
@@ -124,7 +124,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"supervised_user/supervised_user_interstitial_tab_closer.cc",
"supervised_user/supervised_user_interstitial_tab_closer.h",
"supervised_user/supervised_user_metrics_service_factory.cc",
-@@ -1743,9 +1733,6 @@ static_library("browser") {
+@@ -1746,9 +1736,6 @@ static_library("browser") {
"//chrome/browser/commerce:impl",
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -134,7 +134,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/media/webrtc",
"//chrome/browser/navigation_predictor:impl",
"//chrome/browser/file_system_access:impl",
-@@ -1820,7 +1807,6 @@ static_library("browser") {
+@@ -1823,7 +1810,6 @@ static_library("browser") {
# New dependencies inside of //chrome/browser that generate header files
# should be added to browser_generated_files.
":browser_public_dependencies",
@@ -924,7 +924,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
-@@ -6182,7 +6182,6 @@ test("unit_tests") {
+@@ -6183,7 +6183,6 @@ test("unit_tests") {
"//chrome/browser/file_system_access:unit_tests",
"//chrome/browser/fingerprinting_protection",
"//chrome/browser/first_party_sets",