Disables upstream features flagged by security/privacy teams.

shantanuSakpal · Nov 27, 2023 · ad8ce55 · ad8ce55
1 parent 750d1de
commit ad8ce55
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 0 deletions.
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
@@ -119,6 +119,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
     &apps::features::kDesktopPWAsLinkCapturing,
 #endif
+    &attribution_reporting::features::kAttributionReportingTriggerConfig,
     &attribution_reporting::features::kConversionMeasurement,
     &autofill::features::kAutofillEnableRemadeDownstreamMetrics,
     &autofill::features::test::kAutofillServerCommunication,
@@ -129,6 +130,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &blink::features::kAdAuctionReportingWithMacroApi,
     &blink::features::kAdInterestGroupAPI,
     &blink::features::kAllowURNsInIframes,
+    &blink::features::kAttributionReportingInBrowserMigration,
     &blink::features::kBackgroundResourceFetch,
     &blink::features::kBiddingAndScoringDebugReportingAPI,
     &blink::features::kBrowsingTopics,
@@ -148,7 +150,9 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &blink::features::kPrerender2,
     &blink::features::kPrivacySandboxAdsAPIs,
     &blink::features::kPrivateAggregationApi,
+    &blink::features::kPrivateAggregationApiMultipleCloudProviders,
     &blink::features::kSharedStorageAPI,
+    &blink::features::kSharedStorageAPIM118,
     &blink::features::kSharedStorageSelectURLLimit,
     &blink::features::kSpeculationRulesHeaderEnableThirdPartyOriginTrial,
     &blink::features::kSpeculationRulesPrefetchFuture,
@@ -182,6 +186,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &features::kBookmarkTriggerForPrerender2,
     &features::kChromeLabs,
     &features::kChromeRefresh2023,
+    &features::kCookieDeprecationFacilitatedTesting,
 #if !BUILDFLAG(IS_ANDROID)
     &features::kCopyLinkToText,
 #endif
@@ -196,6 +201,9 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
 #endif
     &features::kIdleDetection,
     &features::kKAnonymityService,
+    &features::kKAnonymityServiceOHTTPRequests,
+    &features::kLegacyTechReportEnableCookieIssueReports,
+    &features::kLegacyTechReportTopLevelUrl,
     &features::kNotificationTriggers,
     &features::kOmniboxTriggerForNoStatePrefetch,
     &features::kOmniboxTriggerForPrerender2,
@@ -287,6 +295,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
 #endif
     &permissions::features::kPermissionOnDeviceNotificationPredictions,
     &permissions::features::kPermissionStorageAccessAPI,
+    &permissions::features::kShowRelatedWebsiteSetsPermissionGrants,
     &privacy_sandbox::kEnforcePrivacySandboxAttestations,
     &privacy_sandbox::kOverridePrivacySandboxSettingsLocalTesting,
     &privacy_sandbox::kPrivacySandboxFirstPartySetsUI,

diff --git a/chromium_src/chrome/common/chrome_features.cc b/chromium_src/chrome/common/chrome_features.cc
@@ -15,6 +15,7 @@ namespace features {
 
 OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kKAnonymityService, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kKAnonymityServiceOHTTPRequests, base::FEATURE_DISABLED_BY_DEFAULT},
     {kPrivacyGuide3, base::FEATURE_DISABLED_BY_DEFAULT},
 #if BUILDFLAG(IS_ANDROID)
     {kPrivacyGuideAndroid, base::FEATURE_DISABLED_BY_DEFAULT},

diff --git a/chromium_src/components/attribution_reporting/features.cc b/chromium_src/components/attribution_reporting/features.cc
@@ -10,6 +10,7 @@
 namespace attribution_reporting::features {
 
 OVERRIDE_FEATURE_DEFAULT_STATES({{
+    {kAttributionReportingTriggerConfig, base::FEATURE_DISABLED_BY_DEFAULT},
     {kConversionMeasurement, base::FEATURE_DISABLED_BY_DEFAULT},
 }});
 

diff --git a/chromium_src/components/permissions/features.cc b/chromium_src/components/permissions/features.cc
@@ -23,6 +23,8 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kRecordPermissionExpirationTimestamps, base::FEATURE_DISABLED_BY_DEFAULT},
 #endif
     {kPermissionStorageAccessAPI, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kShowRelatedWebsiteSetsPermissionGrants,
+     base::FEATURE_DISABLED_BY_DEFAULT},
 }});
 
 }  // namespace features

diff --git a/chromium_src/content/public/common/content_features.cc b/chromium_src/content/public/common/content_features.cc
@@ -12,11 +12,15 @@ namespace features {
 
 OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kAttributionFencedFrameReportingBeacon, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kCookieDeprecationFacilitatedTesting, base::FEATURE_DISABLED_BY_DEFAULT},
     {kDigitalGoodsApi, base::FEATURE_DISABLED_BY_DEFAULT},
     {kDIPS, base::FEATURE_DISABLED_BY_DEFAULT},
     {kFedCm, base::FEATURE_DISABLED_BY_DEFAULT},
     {kFirstPartySets, base::FEATURE_DISABLED_BY_DEFAULT},
     {kIdleDetection, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kLegacyTechReportEnableCookieIssueReports,
+     base::FEATURE_DISABLED_BY_DEFAULT},
+    {kLegacyTechReportTopLevelUrl, base::FEATURE_DISABLED_BY_DEFAULT},
     {kNotificationTriggers, base::FEATURE_DISABLED_BY_DEFAULT},
     {kPrivacySandboxAdsAPIsOverride, base::FEATURE_DISABLED_BY_DEFAULT},
     {kSignedHTTPExchange, base::FEATURE_DISABLED_BY_DEFAULT},

diff --git a/chromium_src/third_party/blink/common/features.cc b/chromium_src/third_party/blink/common/features.cc
@@ -20,6 +20,8 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kAdAuctionReportingWithMacroApi, base::FEATURE_DISABLED_BY_DEFAULT},
     {kAdInterestGroupAPI, base::FEATURE_DISABLED_BY_DEFAULT},
     {kAllowURNsInIframes, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kAttributionReportingInBrowserMigration,
+     base::FEATURE_DISABLED_BY_DEFAULT},
     {kBackgroundResourceFetch, base::FEATURE_DISABLED_BY_DEFAULT},
     {kBiddingAndScoringDebugReportingAPI, base::FEATURE_DISABLED_BY_DEFAULT},
     {kBrowsingTopics, base::FEATURE_DISABLED_BY_DEFAULT},
@@ -40,8 +42,11 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kPrerender2, base::FEATURE_DISABLED_BY_DEFAULT},
     {kPrivacySandboxAdsAPIs, base::FEATURE_DISABLED_BY_DEFAULT},
     {kPrivateAggregationApi, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kPrivateAggregationApiMultipleCloudProviders,
+     base::FEATURE_DISABLED_BY_DEFAULT},
     {kReduceUserAgentMinorVersion, base::FEATURE_ENABLED_BY_DEFAULT},
     {kSharedStorageAPI, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kSharedStorageAPIM118, base::FEATURE_DISABLED_BY_DEFAULT},
     {kSharedStorageSelectURLLimit, base::FEATURE_DISABLED_BY_DEFAULT},
     {kSpeculationRulesHeaderEnableThirdPartyOriginTrial,
      base::FEATURE_DISABLED_BY_DEFAULT},