From 5654b8f4265e7c709ae265b632a1c3026017d1b3 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 17 Sep 2024 18:06:36 -0400 Subject: [PATCH] Fixes blink configuration warnings due to disabled features. --- app/feature_defaults_unittest.cc | 1 + chromium_src/content/common/features.cc | 2 + renderer/brave_content_renderer_client.cc | 3 + test/filters/browser_tests.filter | 73 ++++++++++++++++++++++- 4 files changed, 78 insertions(+), 1 deletion(-) diff --git a/app/feature_defaults_unittest.cc b/app/feature_defaults_unittest.cc index e83bc2df5a74..3f8aaad2f337 100644 --- a/app/feature_defaults_unittest.cc +++ b/app/feature_defaults_unittest.cc @@ -165,6 +165,7 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { &features::kPrivacyGuidePreloadAndroid, #endif &features::kPrivacySandboxAdsAPIsOverride, + &features::kPrivacySandboxAdsAPIsM1Override, #if !BUILDFLAG(IS_ANDROID) &features::kReportPakFileIntegrity, #endif diff --git a/chromium_src/content/common/features.cc b/chromium_src/content/common/features.cc index f521efe56003..0acdf2f8404c 100644 --- a/chromium_src/content/common/features.cc +++ b/chromium_src/content/common/features.cc @@ -11,6 +11,8 @@ namespace features { OVERRIDE_FEATURE_DEFAULT_STATES({{ + // This feature should not be enabled when kFencedFrames is disabled. + {kPrivacySandboxAdsAPIsM1Override, base::FEATURE_DISABLED_BY_DEFAULT}, {kResourceTimingForCancelledNavigationInFrame, base::FEATURE_DISABLED_BY_DEFAULT}, {kServiceWorkerAutoPreload, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/renderer/brave_content_renderer_client.cc b/renderer/brave_content_renderer_client.cc index 9be541bbbe3c..f59060288a43 100644 --- a/renderer/brave_content_renderer_client.cc +++ b/renderer/brave_content_renderer_client.cc @@ -89,6 +89,9 @@ void BraveContentRendererClient:: SetRuntimeFeaturesDefaultsBeforeBlinkInitialization(); blink::WebRuntimeFeatures::EnableFledge(false); + // Disable topics APIs because kBrowsingTopics feature is disabled + blink::WebRuntimeFeatures::EnableTopicsAPI(false); + blink::WebRuntimeFeatures::EnableTopicsDocumentAPI(false); blink::WebRuntimeFeatures::EnableWebGPUExperimentalFeatures(false); blink::WebRuntimeFeatures::EnableWebNFC(false); diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter index 7efd44977089..d3823c22bb8a 100644 --- a/test/filters/browser_tests.filter +++ b/test/filters/browser_tests.filter @@ -260,6 +260,7 @@ -ExternalProtocolHandlerSandboxFencedFrameBrowserTest.SandboxAllowTopNavigationByUserActivationWithGestureInFencedFrame -PrivacySandboxSettingsAdsApisFlagBrowserTest.FollowsOverrideBehavior -SharedStorageChromeContextOriginByDefaultDisabledBrowserTest.* +-SharedStorageChromeCrossOriginScriptDisabledBrowserTest.AddModule_CrossOriginScriptError -SharedStorageExtensionBrowserTest.* -SharedStorageFencedFrameChromeBrowserTest.* @@ -831,12 +832,26 @@ -WebViewTests/WebViewTest.DownloadCookieIsolation_CrossSession/SiteIsolationForGuestsEnabled # These tests fail because we intentionally disable fenced frames via -# blink::features::kFencedFrames +# blink::features::kFencedFrames and -AccessContextAuditFencedFrameBrowserTest.* +-All/HostedAppProcessModelFencedFrameTest.FencedFrameHasDifferentSiteInstance/0 -All/IntentPickerBubbleViewFencedFrameBrowserTest.* -All/IntentPickerIconFencedFrameBrowserTest.ShouldShowIntentPickerInFencedFrame/* +-All/PaintPreviewFencedFrameBrowserTest.* +-All/PDFExtensionPrerenderAndFencedFrameTest.* -All/SafeBrowsingFencedFrameBrowserTest.* +-All/SecurityStateTabHelperFencedFrameTest.* +-AmpPageLoadMetricsFencedFrameBrowserTest.AmpFencedFrame +-AppBannerManagerFencedFrameBrowserTest.FencedFrameShouldNotUpdateState +-AutoplayPolicyFencedFrameTest.AutoplayAllowedByPolicy +-AutoplayPolicyFencedFrameTest.AutoplayAllowlist_Allowed -BackgroundFetchFencedFrameBrowserTest.* +-ChromeAppAPIFencedFrameTest.NoInfo +-ChromeRegisterProtocolHandlerBrowserTest.FencedFrame +-CommerceHintAgentFencedFrameTest.VisitCartInFencedFrame +-ComposeEnablingWithFencedFramesBrowserTest.DisabledInFencedFrames +-ContentScriptApiFencedFrameTest.InjectionMatchesCorrectExtension +-ContentSettingsWithFencedFrameBrowserTest.FencedFrameSetsCookie -ContentSettingsWithFencedFrameBrowserTest.NestedFramesRendererContentSettings -ContentSettingsWithFencedFrameBrowserTest.RendererContentSettings -ContentSettingsWithFencedFrameBrowserTest.StorageAccessInFencedFrame @@ -846,20 +861,76 @@ -ContextMenuFencedFrameTest.Save* -ContextMenuFencedFrameTestNoTestingConfig.AutomaticBeaconSentAfterContextMenuNavigation -DeclarativeNetRequestApiFencedFrameTest/DeclarativeNetRequestApiFencedFrameTest.* +-ExecuteScriptApiFencedFrameTest.Load +-ExtensionActionRunnerFencedFrameBrowserTest.DoNotResetExtensionActionRunner +-ExtensionActionRunnerFencedFrameBrowserTest.FencedFrameDoesNotClearActiveExtensions -ExtensionWebRequestApiFencedFrameTest.DeclarativeSendMessage -ExtensionWebRequestApiFencedFrameTest/ExtensionWebRequestApiFencedFrameTest.* +-ExtensionWebRequestApiFencedFrameTest.Load +-ExternalProtocolHandlerSandboxFencedFrameBrowserTest.* +-FencedFrameDownloadTest.DownloadRequestLimiterIsUnaffectedByFencedFrame +-FencedFrameDownloadTest.FencedFrameSandboxFlagBlockDownload +-FencedFrameDownloadTest.NetworkCutoffBlockSaveImageAs +-FencedFrameFileSystemAccessBrowserTest.RequestWriteAccess -FencedFrameLoadingPredictorBrowserTest.* +-FencedFrameReduceAcceptLanguageBrowserTest.CrossOriginFencedFrame +-FencedFrameReduceAcceptLanguageBrowserTest.SameOriginFencedFrame -FencedFrameSiteDetailsBrowserTest.* +-FencedFrameTaskBrowserTest.* +-FencedFrameTaskBrowserTestNoTestingConfig.ProperlyShowsTasks +-FramebustBlockFencedFrameTest.FramebustBlocked_FencedFrameNavigation +-HistoryFencedFrameBrowserTest.FencedFrameDoesNotAffectLoadingState +-InsecureFormNavigationThrottleFencedFrameBrowserTest.DoNotCreateSecurityInterstitialInFencedFrame -InspectUIFencedFrameTest.* +-LoginDetectionFencedFrameBrowserTest.FencedFrameShouldNotRecordLoginDetectionMetrics +-MediaEngagementContentsObserverFencedFrameBrowserTest.SendEngagementLevelToRenderFrameOnFencedFrame -MessagingApiFencedFrameTest.Load -MessagingApiFencedFrameTest/MessagingApiFencedFrameTest.* +-MixedContentSettingsTabHelperFencedFrameBrowserTest.IgnoreInsecureContentInFencedFrame +-NavigationPredictorFencedFrameBrowserTest.EnsureFencedFrameDoesNotCreateNavigationPredictor +-NetErrorTabHelperWithFencedFrameTest.CanRunDiagnosticsDialogOnFencedFrame +-NewTabPageNavigationThrottleFencedFrameTest.FencedFrameShouldNotAffectTitle +-NoStatePrefetchFencedFrameBrowserTest.ShouldNotRecordNavigation +-PageLoadMetricsBrowserTestWithFencedFrames.PageLoadPrivacySandboxAdsFencedFramesMetrics +-PageLoadMetricsObserverFencedFrameBrowserTest.FencedFrameCountsAsSubFramePageLoad +-PageTextObserverFencedFrameBrowserTest.DoNotDispatchResponseOnFencedFrame -PerformanceHintsObserverFencedFrameTest.* +-PermissionRequestManagerWithFencedFrameTest.GetCurrentPosition +-PermissionRequestManagerWithFencedFrameTest.RequestPermissionThruDelegate +-PictureInPictureWindowControllerFencedFrameBrowserTest.FencedFrameShouldNotCloseWindow +-PlatformAppNavigationRedirectorFencedFrameBrowserTest.DoNotLaunchAppInFencedFrames -PrefetchProxyFencedFrameBrowserTest.* +-PrintFencedFrameBrowserTest.DocumentExecCommand +-PrintFencedFrameBrowserTest.ScriptedPrint +-SBNavigationObserverBrowserTest.FencedFrameNavigationEventsAndReferrerChain -SigninReauthViewControllerFencedFrameBrowserTest.* +-SSLFencedFrameBrowserTest.CertErrorInFencedFrame +-SSLFencedFrameBrowserTest.InAppTestProceededBadCertPageInFencedFrame +-SafeBrowsingTriggeredPopupBlockerFencedFrameBrowserTest.ShouldNotTriggerPopupBlocker +-SafeBrowsingTriggeredPopupBlockerFencedFrameBrowserTest.ShouldTriggerPopupBlocker +-SameOriginObserverFencedFrameTest.FFDoesNotAffectSameOriginState +-SecurityStatePageLoadMetricsFencedFrameBrowserTest.DoNotRecordOnCommitSecurityLevelHistogram +-SoundContentSettingObserverFencedFrameBrowserTest.AddAutoplayFlagsInFencedFrame +-SubresourceFilterFencedFrameBrowserTest.CollapseBlockedFencedFrame +-SubresourceFilterFencedFrameBrowserTest.FencedFrameLoadFiltering +-SubresourceFilterFencedFrameBrowserTest.LoadFilteringNestedInFencedFrame +-SubresourceFilterFencedFrameBrowserTest.NavigatesToURLWithWarning_NoMessageLogged +-SubresourceFilterFencedFrameBrowserTest.OutermostFrameActivation -TabContentsTagFencedFrameTest.FencedFrameDoesNotUpdateTitle +-TabManagerFencedFrameTest.TabManagerWasDiscarded +-TabStatsTrackerSubFrameBrowserTest.VerifyBehaviorOnSubFrameNavigation +-TabUnderBlockerFencedFrameTest.RedirectAfterGesture_WithFF_IsNotBlocked +-TabUnderBlockerFencedFrameTest.SimpleTabUnder_WithFencedFrame_IsBlocked +-TrustedVaultEncryptionKeysTabHelperBrowserTest.ShouldBindClientEncryptionKeysApiInFencedFrame +-TrustedVaultEncryptionKeysTabHelperBrowserTest.ShouldBindSyncEncryptionKeysApiInFencedFrame +-WebAuthFlowFencedFrameTest.FencedFrameNavigationFailure +-WebAuthFlowFencedFrameTest.FencedFrameNavigationSuccess -WebNavigationApiFencedFrameTest.Load -WebNavigationApiFencedFrameTest/WebNavigationApiFencedFrameTest.* +-WebViewTests/WebViewFencedFrameTest.FencedFrameInGuestHasGuestSiteInstance/IsolateFencedFramesDisabled +-WebViewTests/WebViewFencedFrameTest.FencedFrameInGuestHasGuestSiteInstance/IsolateFencedFramesEnabled -WebViewTests/WebViewFencedFrameTest.FencedFrameInGuestHasGuestSiteInstance/SiteIsolationForGuestsEnabled +-WebViewWithDefaultSiteInstanceTest.FencedFrame # These tests fail because we skip amp pages with deamp -AMPPageLoadMetricsObserverTest.*