diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 1911e817723..e0f72bee202 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -328,10 +328,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->SetDefaultPrefValue(prefs::kPrivacySandboxApisEnabledV2, base::Value(false)); - // Disable Chromium's privacy sandbox - registry->SetDefaultPrefValue(prefs::kPrivacySandboxFlocEnabled, - base::Value(false)); - // Importer: selected data types registry->RegisterBooleanPref(kImportDialogExtensions, true); registry->RegisterBooleanPref(kImportDialogPayments, true); diff --git a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc index 21b9cf2b3d4..a137d3f120b 100644 --- a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc +++ b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc @@ -520,18 +520,14 @@ TEST_F(PrivacySandboxSettingsTest, IsTopicsAllowed) { /*managed_cookie_setting=*/privacy_sandbox_test_util::kNoSetting, /*managed_cookie_exceptions=*/{}); - // FLoC should be disabled since the privacy sandbox APIs can't be enabled. - prefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled, true); EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed()); - // Check that even bypassing PrivacySandboxSettings::SetFlocPrefEnabled, - // and manually updating the preferences, we still don't get this enabled. + // Check that even manually updating the preferences, we still don't get this + // enabled. profile()->GetTestingPrefService()->SetBoolean( prefs::kPrivacySandboxApisEnabled, true); profile()->GetTestingPrefService()->SetBoolean( prefs::kPrivacySandboxApisEnabledV2, true); - profile()->GetTestingPrefService()->SetBoolean( - prefs::kPrivacySandboxFlocEnabled, true); EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed()); privacy_sandbox_test_util::SetupTestState( @@ -542,7 +538,10 @@ TEST_F(PrivacySandboxSettingsTest, IsTopicsAllowed) { /*user_cookie_exceptions=*/{}, /*managed_cookie_setting=*/privacy_sandbox_test_util::kNoSetting, /*managed_cookie_exceptions=*/{}); - prefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled, true); + profile()->GetTestingPrefService()->SetBoolean( + prefs::kPrivacySandboxApisEnabled, true); + profile()->GetTestingPrefService()->SetBoolean( + prefs::kPrivacySandboxApisEnabledV2, true); EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed()); privacy_sandbox_test_util::SetupTestState( @@ -553,7 +552,10 @@ TEST_F(PrivacySandboxSettingsTest, IsTopicsAllowed) { /*user_cookie_exceptions=*/{}, /*managed_cookie_setting=*/privacy_sandbox_test_util::kNoSetting, /*managed_cookie_exceptions=*/{}); - prefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled, true); + profile()->GetTestingPrefService()->SetBoolean( + prefs::kPrivacySandboxApisEnabled, true); + profile()->GetTestingPrefService()->SetBoolean( + prefs::kPrivacySandboxApisEnabledV2, true); EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed()); privacy_sandbox_test_util::SetupTestState( @@ -564,7 +566,10 @@ TEST_F(PrivacySandboxSettingsTest, IsTopicsAllowed) { /*user_cookie_exceptions=*/{}, /*managed_cookie_setting=*/privacy_sandbox_test_util::kNoSetting, /*managed_cookie_exceptions=*/{}); - prefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled, true); + profile()->GetTestingPrefService()->SetBoolean( + prefs::kPrivacySandboxApisEnabled, true); + profile()->GetTestingPrefService()->SetBoolean( + prefs::kPrivacySandboxApisEnabledV2, true); EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed()); } class PrivacySandboxSettingsTestCookiesClearOnExitTurnedOff diff --git a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc index 6b4205d2a24..3f5924ed22b 100644 --- a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc +++ b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc @@ -25,7 +25,7 @@ BravePrivacySandboxSettings::BravePrivacySandboxSettings( pref_service, incognito_profile), pref_service_(pref_service) { - // Register observers for the Privacy Sandbox & FLoC preferences. + // Register observers for the Privacy Sandbox. user_prefs_registrar_.Init(pref_service_); user_prefs_registrar_.Add( prefs::kPrivacySandboxApisEnabled, @@ -37,11 +37,6 @@ BravePrivacySandboxSettings::BravePrivacySandboxSettings( base::BindRepeating( &BravePrivacySandboxSettings::OnPrivacySandboxPrefChanged, base::Unretained(this))); - user_prefs_registrar_.Add( - prefs::kPrivacySandboxFlocEnabled, - base::BindRepeating( - &BravePrivacySandboxSettings::OnPrivacySandboxPrefChanged, - base::Unretained(this))); } BravePrivacySandboxSettings::~BravePrivacySandboxSettings() = default; @@ -55,7 +50,4 @@ void BravePrivacySandboxSettings::OnPrivacySandboxPrefChanged() { if (pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabledV2)) { pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, false); } - if (pref_service_->GetBoolean(prefs::kPrivacySandboxFlocEnabled)) { - pref_service_->SetBoolean(prefs::kPrivacySandboxFlocEnabled, false); - } }