diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index e119f2fab39..4c9c87b6c06 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -124,6 +124,9 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &autofill::features::kAutofillEnableRemadeDownstreamMetrics, &autofill::features::test::kAutofillServerCommunication, &autofill::features::kAutofillUpstreamAllowAdditionalEmailDomains, +#if BUILDFLAG(IS_ANDROID) + &base::features::kCollectAndroidFrameTimelineMetrics, +#endif &blink::features::kAdAuctionReportingWithMacroApi, &blink::features::kAdInterestGroupAPI, &blink::features::kAllowURNsInIframes, @@ -210,6 +213,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &features::kPrivacyGuidePreloadAndroid, #endif &features::kPrivacySandboxAdsAPIsOverride, + &features::kResourceTimingForCancelledNavigationInFrame, &features::kSCTAuditing, &features::kServiceWorkerAutoPreload, &features::kSignedExchangeReportingForDistributors, @@ -235,6 +239,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &history_clusters::internal::kJourneys, &history_clusters::internal::kJourneysImages, &history_clusters::internal::kJourneysNamedNewTabGroups, + &history_clusters::internal::kJourneysPersistCachesToPrefs, &history_clusters::internal::kJourneysZeroStateFiltering, &history_clusters::internal::kOmniboxAction, &history_clusters::internal::kOmniboxHistoryClusterProvider, @@ -253,6 +258,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &net::features::kPartitionedCookies, &net::features::kThirdPartyPartitionedStorageAllowedByDefault, &net::features::kThirdPartyStoragePartitioning, + &net::features::kWaitForFirstPartySetsInit, &network::features::kFledgePst, &network::features::kPrivateStateTokens, &network_time::kNetworkTimeServiceQuerying, @@ -286,10 +292,13 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { #endif &permissions::features::kPermissionOnDeviceNotificationPredictions, &permissions::features::kPermissionStorageAccessAPI, - &privacy_sandbox::kOverridePrivacySandboxSettingsLocalTesting, &privacy_sandbox::kEnforcePrivacySandboxAttestations, + &privacy_sandbox::kOverridePrivacySandboxSettingsLocalTesting, + &privacy_sandbox::kPrivacySandboxFirstPartySetsUI, + &privacy_sandbox::kPrivacySandboxProactiveTopicsBlocking, &privacy_sandbox::kPrivacySandboxSettings3, &privacy_sandbox::kPrivacySandboxSettings4, + &privacy_sandbox::kTrackingProtectionOnboardingForceEligibility, &promos_features::kIOSPromoPasswordBubble, &safe_browsing::kExtensionTelemetry, &safe_browsing::kExtensionTelemetryDisableOffstoreExtensions, diff --git a/chromium_src/base/features.cc b/chromium_src/base/features.cc new file mode 100644 index 00000000000..83ae39d8594 --- /dev/null +++ b/chromium_src/base/features.cc @@ -0,0 +1,18 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#include "src/base/features.cc" + +#include "base/feature_override.h" + +namespace base::features { + +OVERRIDE_FEATURE_DEFAULT_STATES({{ +#if BUILDFLAG(IS_ANDROID) + {kCollectAndroidFrameTimelineMetrics, base::FEATURE_DISABLED_BY_DEFAULT}, +#endif +}}); + +} // namespace base::features diff --git a/chromium_src/components/history_clusters/core/features.cc b/chromium_src/components/history_clusters/core/features.cc index d8dc01dad85..e84505e01c1 100644 --- a/chromium_src/components/history_clusters/core/features.cc +++ b/chromium_src/components/history_clusters/core/features.cc @@ -16,6 +16,7 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kJourneys, base::FEATURE_DISABLED_BY_DEFAULT}, {kJourneysImages, base::FEATURE_DISABLED_BY_DEFAULT}, {kJourneysNamedNewTabGroups, base::FEATURE_DISABLED_BY_DEFAULT}, + {kJourneysPersistCachesToPrefs, base::FEATURE_DISABLED_BY_DEFAULT}, {kJourneysZeroStateFiltering, base::FEATURE_DISABLED_BY_DEFAULT}, {kOmniboxAction, base::FEATURE_DISABLED_BY_DEFAULT}, {kOmniboxHistoryClusterProvider, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/chromium_src/components/privacy_sandbox/privacy_sandbox_features.cc b/chromium_src/components/privacy_sandbox/privacy_sandbox_features.cc index b2d4fca35a4..5f6c80b8dd2 100644 --- a/chromium_src/components/privacy_sandbox/privacy_sandbox_features.cc +++ b/chromium_src/components/privacy_sandbox/privacy_sandbox_features.cc @@ -11,9 +11,13 @@ namespace privacy_sandbox { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kEnforcePrivacySandboxAttestations, base::FEATURE_DISABLED_BY_DEFAULT}, + {kOverridePrivacySandboxSettingsLocalTesting, + base::FEATURE_DISABLED_BY_DEFAULT}, + {kPrivacySandboxFirstPartySetsUI, base::FEATURE_DISABLED_BY_DEFAULT}, + {kPrivacySandboxProactiveTopicsBlocking, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrivacySandboxSettings3, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrivacySandboxSettings4, base::FEATURE_DISABLED_BY_DEFAULT}, - {kOverridePrivacySandboxSettingsLocalTesting, + {kTrackingProtectionOnboardingForceEligibility, base::FEATURE_DISABLED_BY_DEFAULT}, }}); diff --git a/chromium_src/content/browser/aggregation_service/aggregation_service_features.cc b/chromium_src/content/browser/aggregation_service/aggregation_service_features.cc index 88714dd9bbd..d9a1df31df5 100644 --- a/chromium_src/content/browser/aggregation_service/aggregation_service_features.cc +++ b/chromium_src/content/browser/aggregation_service/aggregation_service_features.cc @@ -11,6 +11,8 @@ namespace content { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kPrivacySandboxAggregationService, base::FEATURE_DISABLED_BY_DEFAULT}, + {kPrivacySandboxAggregationServiceReportPadding, + base::FEATURE_DISABLED_BY_DEFAULT}, }}); } // namespace content diff --git a/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc b/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc new file mode 100644 index 00000000000..360964af587 --- /dev/null +++ b/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc @@ -0,0 +1,17 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#include "src/content/browser/private_aggregation/private_aggregation_features.cc" + +#include "base/feature_override.h" + +namespace content { + +OVERRIDE_FEATURE_DEFAULT_STATES({{ + {kPrivateAggregationApiBundledEnhancements, + base::FEATURE_DISABLED_BY_DEFAULT}, +}}); + +} // namespace content diff --git a/chromium_src/content/common/features.cc b/chromium_src/content/common/features.cc index 625190bbc33..7dc76db6c00 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({{ + {kResourceTimingForCancelledNavigationInFrame, + base::FEATURE_DISABLED_BY_DEFAULT}, {kSignedExchangeReportingForDistributors, base::FEATURE_DISABLED_BY_DEFAULT}, {kServiceWorkerAutoPreload, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/chromium_src/net/base/features.cc b/chromium_src/net/base/features.cc index 2f787d5b478..405e4de921b 100644 --- a/chromium_src/net/base/features.cc +++ b/chromium_src/net/base/features.cc @@ -28,6 +28,7 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kThirdPartyPartitionedStorageAllowedByDefault, base::FEATURE_DISABLED_BY_DEFAULT}, {kThirdPartyStoragePartitioning, base::FEATURE_DISABLED_BY_DEFAULT}, + {kWaitForFirstPartySetsInit, base::FEATURE_DISABLED_BY_DEFAULT}, }}); BASE_FEATURE(kBraveEphemeralStorage,