diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index 0d8678d08..bde8c1482 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -8,14 +8,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../origin_trials/origin_trial_policy_impl.cc | 7 ++++--- .../origin_trials/origin_trial_policy_impl.h | 2 +- .../browser/renderer_host/navigation_request.cc | 1 - - .../origin_trial_state_host_impl.cc | 9 --------- + .../origin_trial_state_host_impl.cc | 8 -------- content/renderer/render_frame_impl.cc | 17 +---------------- .../shell/common/shell_origin_trial_policy.cc | 10 ++++------ .../origin_trials/trial_token_validator.cc | 1 + .../renderer/core/loader/document_loader.cc | 17 ----------------- .../blink/renderer/core/loader/http_equiv.cc | 2 +- .../core/origin_trials/origin_trial_context.cc | 6 ++++-- - 11 files changed, 16 insertions(+), 57 deletions(-) + 11 files changed, 16 insertions(+), 56 deletions(-) diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc --- a/android_webview/common/aw_content_client.cc @@ -76,7 +76,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -8867,7 +8867,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() { +@@ -8888,7 +8888,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() { void NavigationRequest::ForceEnableOriginTrials( const std::vector& trials) { DCHECK(!HasCommitted()); @@ -87,13 +87,12 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows diff --git a/content/browser/renderer_host/origin_trial_state_host_impl.cc b/content/browser/renderer_host/origin_trial_state_host_impl.cc --- a/content/browser/renderer_host/origin_trial_state_host_impl.cc +++ b/content/browser/renderer_host/origin_trial_state_host_impl.cc -@@ -99,15 +99,6 @@ void OriginTrialStateHostImpl::ApplyFeatureDiffForOriginTrial( - feature_pair.second->tokens; - } - } -- // Apply the diff changes to the mutable RuntimeFeatureStateReadContext. +@@ -108,14 +108,6 @@ void OriginTrialStateHostImpl::ApplyFeatureDiffForOriginTrial( + // This issue should be revisited to avoid silently dropping any feature + // overrides that are stored in the RFSDocumentData, in these corner cases + // when the data has become a nullptr. - RuntimeFeatureStateDocumentData* document_data = -- RuntimeFeatureStateDocumentData::GetForCurrentDocument( +- RuntimeFeatureStateDocumentData::GetOrCreateForCurrentDocument( - &render_frame_host()); - CHECK(document_data); - document_data diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index beffce7f3..6e69396c0 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -1199,10 +1199,10 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/internals/internals_ui.h" #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h" #include "chrome/browser/ui/webui/intro/intro_ui.h" -@@ -427,8 +426,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, - if (url.host_piece() == chrome::kChromeUIFlagsHost && - FlagsDeprecatedUI::IsDeprecatedUrl(url)) - return &NewWebUI; +@@ -430,8 +429,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, + if (url.host_piece() == chrome::kChromeUIFlagsHost) { + return &NewWebUI; + } - if (url.host_piece() == chrome::kChromeUIGCMInternalsHost) - return &NewWebUI; if (url.host_piece() == chrome::kChromeUIInternalsHost)