From 870e4f705e6dde11d580c76aaf3ef48a6d606070 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 3 May 2024 11:46:46 -0400 Subject: [PATCH] Disables upstream features flagged by security/privacy teams. --- app/BUILD.gn | 2 ++ app/feature_defaults_unittest.cc | 8 ++++++++ .../chrome/browser/signin/signin_features.cc | 4 ++++ chromium_src/chrome/common/chrome_features.cc | 1 + .../privacy_budget/privacy_budget_features.cc | 16 ++++++++++++++++ .../compose/core/browser/compose_features.cc | 16 ++++++++++++++++ 6 files changed, 47 insertions(+) create mode 100644 chromium_src/chrome/common/privacy_budget/privacy_budget_features.cc create mode 100644 chromium_src/components/compose/core/browser/compose_features.cc diff --git a/app/BUILD.gn b/app/BUILD.gn index c1a42d982ccc..6d66616a0b84 100644 --- a/app/BUILD.gn +++ b/app/BUILD.gn @@ -123,10 +123,12 @@ source_set("unit_tests") { "//chrome/browser/enterprise/connectors/analysis:features", "//chrome/browser/ui", "//chrome/common/companion/visual_query:flags", + "//chrome/common/privacy_budget", "//components/aggregation_service", "//components/attribution_reporting", "//components/autofill/core/common", "//components/commerce/core:feature_list", + "//components/compose/core/browser:features", "//components/content_settings/core/common:features", "//components/device_signals/core/common:features", "//components/heap_profiling/in_process", diff --git a/app/feature_defaults_unittest.cc b/app/feature_defaults_unittest.cc index 6cc76c674856..7298efd44189 100644 --- a/app/feature_defaults_unittest.cc +++ b/app/feature_defaults_unittest.cc @@ -15,11 +15,13 @@ #include "chrome/browser/ui/ui_features.h" #include "chrome/common/chrome_features.h" #include "chrome/common/companion/visual_query/features.h" +#include "chrome/common/privacy_budget/privacy_budget_features.h" #include "components/aggregation_service/features.h" #include "components/attribution_reporting/features.h" #include "components/autofill/core/common/autofill_features.h" #include "components/autofill/core/common/autofill_payments_features.h" #include "components/commerce/core/commerce_feature_list.h" +#include "components/compose/core/browser/compose_features.h" #include "components/content_settings/core/common/features.h" #include "components/heap_profiling/in_process/heap_profiler_parameters.h" #include "components/history/core/browser/features.h" @@ -122,6 +124,7 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { &companion::features::internal::kSidePanelCompanion, &companion::features::internal::kSidePanelCompanion2, &companion::visual_query::features::kVisualQuerySuggestions, + &compose::features::kEnableCompose, &content_settings::features::kTrackingProtection3pcd, &content_settings::features::kUserBypassUI, #if !BUILDFLAG(IS_ANDROID) @@ -136,6 +139,7 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { &features::kChromeLabs, &features::kChromeRefresh2023, &features::kChromeRefresh2023NTB, + &features::kChromeStructuredMetrics, &features::kChromeWebuiRefresh2023, &features::kControlledFrame, &features::kCookieDeprecationFacilitatedTesting, @@ -149,6 +153,7 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { #if !BUILDFLAG(IS_ANDROID) &features::kHaTSWebUI, #endif + &features::kIdentifiabilityStudyMetaExperiment, &features::kIdleDetection, &features::kKAnonymityService, &features::kKAnonymityServiceOHTTPRequests, @@ -202,6 +207,9 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { #if !BUILDFLAG(IS_ANDROID) &kForYouFre, #endif +#if BUILDFLAG(ENABLE_DICE_SUPPORT) + &kPreconnectAccountCapabilitiesBeforeSignIn, +#endif #if BUILDFLAG(ENABLE_MIRROR) &kVerifyRequestInitiatorForMirrorHeaders, #endif diff --git a/chromium_src/chrome/browser/signin/signin_features.cc b/chromium_src/chrome/browser/signin/signin_features.cc index d5787002c758..e21d94b6771f 100644 --- a/chromium_src/chrome/browser/signin/signin_features.cc +++ b/chromium_src/chrome/browser/signin/signin_features.cc @@ -13,6 +13,10 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ #if !BUILDFLAG(IS_ANDROID) {kForYouFre, base::FEATURE_DISABLED_BY_DEFAULT}, #endif // !BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(ENABLE_DICE_SUPPORT) + {kPreconnectAccountCapabilitiesBeforeSignIn, + base::FEATURE_DISABLED_BY_DEFAULT}, +#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #if BUILDFLAG(ENABLE_MIRROR) {kVerifyRequestInitiatorForMirrorHeaders, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/chromium_src/chrome/common/chrome_features.cc b/chromium_src/chrome/common/chrome_features.cc index 6db6d5b6157d..ab7e6f15c87d 100644 --- a/chromium_src/chrome/common/chrome_features.cc +++ b/chromium_src/chrome/common/chrome_features.cc @@ -17,6 +17,7 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kControlledFrame, base::FEATURE_DISABLED_BY_DEFAULT}, {kKAnonymityService, base::FEATURE_DISABLED_BY_DEFAULT}, {kKAnonymityServiceOHTTPRequests, base::FEATURE_DISABLED_BY_DEFAULT}, + {kChromeStructuredMetrics, base::FEATURE_DISABLED_BY_DEFAULT}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) {kDesktopPWAsLinkCapturing, base::FEATURE_DISABLED_BY_DEFAULT}, #endif diff --git a/chromium_src/chrome/common/privacy_budget/privacy_budget_features.cc b/chromium_src/chrome/common/privacy_budget/privacy_budget_features.cc new file mode 100644 index 000000000000..f7de0093242b --- /dev/null +++ b/chromium_src/chrome/common/privacy_budget/privacy_budget_features.cc @@ -0,0 +1,16 @@ +/* Copyright (c) 2024 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/chrome/common/privacy_budget/privacy_budget_features.cc" + +#include "base/feature_override.h" + +namespace features { + +OVERRIDE_FEATURE_DEFAULT_STATES({{ + {kIdentifiabilityStudyMetaExperiment, base::FEATURE_DISABLED_BY_DEFAULT}, +}}); + +} // namespace features diff --git a/chromium_src/components/compose/core/browser/compose_features.cc b/chromium_src/components/compose/core/browser/compose_features.cc new file mode 100644 index 000000000000..f04f6b0b5ce1 --- /dev/null +++ b/chromium_src/components/compose/core/browser/compose_features.cc @@ -0,0 +1,16 @@ +/* Copyright (c) 2024 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/components/compose/core/browser/compose_features.cc" + +#include "base/feature_override.h" + +namespace compose::features { + +OVERRIDE_FEATURE_DEFAULT_STATES({{ + {kEnableCompose, base::FEATURE_DISABLED_BY_DEFAULT}, +}}); + +} // namespace compose::features