From ea62f03f18923b93796eab3761b1af656d2c0745 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:09:44 +0000 Subject: [PATCH] Incognito data removed from PrivacySandboxSettings Chromium change: https://chromium.googlesource.com/chromium/src/+/eb304675fb1fa4e00862d7873413e2b4a96d53a7 commit eb304675fb1fa4e00862d7873413e2b4a96d53a7 Author: Rohit Agarwal Date: Thu Dec 1 08:22:44 2022 +0000 Privacy Sandbox Settings: Move incognito logic to delegate This CL moves the incognito check from PrivacySandboxSettings to PrivacySandboxSettingsDelegate instead which is more appropriate place to hold that information. Bug: 1378703 --- .../privacy_sandbox/privacy_sandbox_settings_factory.cc | 3 +-- .../privacy_sandbox/privacy_sandbox_settings_unittest.cc | 6 +++--- .../privacy_sandbox/brave_privacy_sandbox_settings.cc | 6 ++---- components/privacy_sandbox/brave_privacy_sandbox_settings.h | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.cc b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.cc index f3d5ee01750..2829c8b1f58 100644 --- a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.cc +++ b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.cc @@ -18,6 +18,5 @@ KeyedService* PrivacySandboxSettingsFactory::BuildServiceInstanceFor( return new BravePrivacySandboxSettings( std::make_unique(profile), HostContentSettingsMapFactory::GetForProfile(profile), - CookieSettingsFactory::GetForProfile(profile).get(), profile->GetPrefs(), - profile->IsIncognitoProfile()); + CookieSettingsFactory::GetForProfile(profile).get(), profile->GetPrefs()); } 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 bdb9769d99c..f16aa13b997 100644 --- a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc +++ b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc @@ -30,7 +30,8 @@ class MockPrivacySandboxDelegate : public PrivacySandboxSettings::Delegate { return false; }); } - MOCK_METHOD(bool, IsPrivacySandboxRestricted, (), (override)); + MOCK_METHOD(bool, IsPrivacySandboxRestricted, (), (const, override)); + MOCK_METHOD(bool, IsIncognitoProfile, (), (const, override)); }; class PrivacySandboxSettingsTest : public testing::Test { @@ -60,8 +61,7 @@ class PrivacySandboxSettingsTest : public testing::Test { privacy_sandbox_settings_ = std::make_unique( std::move(mock_delegate), host_content_settings_map(), - cookie_settings(), prefs(), - /*incognito_profile=*/false); + cookie_settings(), prefs()); } virtual void InitializePrefsBeforeStart() {} diff --git a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc index 3f5924ed22b..da13bd1a83b 100644 --- a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc +++ b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc @@ -17,13 +17,11 @@ BravePrivacySandboxSettings::BravePrivacySandboxSettings( std::unique_ptr delegate, HostContentSettingsMap* host_content_settings_map, content_settings::CookieSettings* cookie_settings, - PrefService* pref_service, - bool incognito_profile) + PrefService* pref_service) : privacy_sandbox::PrivacySandboxSettings(std::move(delegate), host_content_settings_map, cookie_settings, - pref_service, - incognito_profile), + pref_service), pref_service_(pref_service) { // Register observers for the Privacy Sandbox. user_prefs_registrar_.Init(pref_service_); diff --git a/components/privacy_sandbox/brave_privacy_sandbox_settings.h b/components/privacy_sandbox/brave_privacy_sandbox_settings.h index 86db6fbd256..8dfab9f1e57 100644 --- a/components/privacy_sandbox/brave_privacy_sandbox_settings.h +++ b/components/privacy_sandbox/brave_privacy_sandbox_settings.h @@ -25,8 +25,7 @@ class BravePrivacySandboxSettings BravePrivacySandboxSettings(std::unique_ptr delegate, HostContentSettingsMap* host_content_settings_map, content_settings::CookieSettings* cookie_settings, - PrefService* pref_service, - bool incognito_profile); + PrefService* pref_service); ~BravePrivacySandboxSettings() override; private: