Skip to content

Commit 3ab6e3e

Browse files
committed
specify the third party cookie setting
1 parent 113e1cb commit 3ab6e3e

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

browser/ephemeral_storage/ephemeral_storage_browsertest.cc

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,13 @@ class EphemeralStorageBaseBrowserTest : public InProcessBrowserTest {
133133
content_settings, brave_shields::ControlType::ALLOW, GURL());
134134
}
135135

136+
void BlockThirdPartyCookies() {
137+
auto* content_settings =
138+
HostContentSettingsMapFactory::GetForProfile(browser()->profile());
139+
brave_shields::SetCookieControlType(
140+
content_settings, brave_shields::ControlType::BLOCK_THIRD_PARTY, GURL());
141+
}
142+
136143
void SetValuesInFrame(RenderFrameHost* frame,
137144
std::string storage_value,
138145
std::string cookie_value) {
@@ -209,6 +216,8 @@ class EphemeralStorageBrowserTest : public EphemeralStorageBaseBrowserTest {
209216
};
210217

211218
IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest, StorageIsPartitioned) {
219+
BlockThirdPartyCookies();
220+
212221
WebContents* first_party_tab = LoadURLInNewTab(b_site_ephemeral_storage_url_);
213222
WebContents* site_a_tab1 = LoadURLInNewTab(a_site_ephemeral_storage_url_);
214223
WebContents* site_a_tab2 = LoadURLInNewTab(a_site_ephemeral_storage_url_);
@@ -286,6 +295,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest, StorageIsPartitioned) {
286295

287296
IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
288297
NavigatingClearsEphemeralStorage) {
298+
BlockThirdPartyCookies();
299+
289300
ui_test_utils::NavigateToURL(browser(), a_site_ephemeral_storage_url_);
290301
auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents();
291302

@@ -324,6 +335,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
324335

325336
IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
326337
ClosingTabClearsEphemeralStorage) {
338+
BlockThirdPartyCookies();
339+
327340
WebContents* site_a_tab = LoadURLInNewTab(a_site_ephemeral_storage_url_);
328341
EXPECT_EQ(browser()->tab_strip_model()->count(), 2);
329342

@@ -372,6 +385,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
372385

373386
IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
374387
ReloadDoesNotClearEphemeralStorage) {
388+
BlockThirdPartyCookies();
389+
375390
ui_test_utils::NavigateToURL(browser(), a_site_ephemeral_storage_url_);
376391
auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents();
377392

@@ -409,6 +424,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
409424

410425
IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
411426
EphemeralStorageDoesNotLeakBetweenProfiles) {
427+
BlockThirdPartyCookies();
428+
412429
ui_test_utils::NavigateToURL(browser(), a_site_ephemeral_storage_url_);
413430
auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents();
414431

@@ -472,6 +489,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
472489

473490
IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
474491
NavigationCookiesArePartitioned) {
492+
BlockThirdPartyCookies();
493+
475494
GURL a_site_set_cookie_url = https_server_.GetURL(
476495
"a.com", "/set-cookie?name=acom;path=/;SameSite=None;Secure");
477496
GURL b_site_set_cookie_url = https_server_.GetURL(
@@ -523,6 +542,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
523542

524543
IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
525544
FirstPartyNestedInThirdParty) {
545+
BlockThirdPartyCookies();
546+
526547
auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents();
527548

528549
GURL a_site_set_cookie_url = https_server_.GetURL(
@@ -718,6 +739,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageDisabledBrowserTest,
718739

719740
IN_PROC_BROWSER_TEST_F(EphemeralStorageDisabledBrowserTest,
720741
ThirdPartyCookiesDisabled) {
742+
BlockThirdPartyCookies();
743+
721744
ui_test_utils::NavigateToURL(browser(), b_site_ephemeral_storage_url_);
722745
auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents();
723746
// We set a value in the page where all the frames are first-party.
@@ -747,7 +770,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageDisabledBrowserTest,
747770

748771
IN_PROC_BROWSER_TEST_F(EphemeralStorageDisabledBrowserTest,
749772
ThirdPartyCookiesDisabledAndNavigateCookies) {
750-
AllowAllCookies();
773+
BlockThirdPartyCookies();
751774

752775
GURL b_site_set_cookie_url = https_server_.GetURL(
753776
"b.com", "/set-cookie?name=bcom;path=/;SameSite=None;Secure");

0 commit comments

Comments
 (0)