@@ -133,6 +133,13 @@ class EphemeralStorageBaseBrowserTest : public InProcessBrowserTest {
133
133
content_settings, brave_shields::ControlType::ALLOW, GURL ());
134
134
}
135
135
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
+
136
143
void SetValuesInFrame (RenderFrameHost* frame,
137
144
std::string storage_value,
138
145
std::string cookie_value) {
@@ -209,6 +216,8 @@ class EphemeralStorageBrowserTest : public EphemeralStorageBaseBrowserTest {
209
216
};
210
217
211
218
IN_PROC_BROWSER_TEST_F (EphemeralStorageBrowserTest, StorageIsPartitioned) {
219
+ BlockThirdPartyCookies ();
220
+
212
221
WebContents* first_party_tab = LoadURLInNewTab (b_site_ephemeral_storage_url_);
213
222
WebContents* site_a_tab1 = LoadURLInNewTab (a_site_ephemeral_storage_url_);
214
223
WebContents* site_a_tab2 = LoadURLInNewTab (a_site_ephemeral_storage_url_);
@@ -286,6 +295,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest, StorageIsPartitioned) {
286
295
287
296
IN_PROC_BROWSER_TEST_F (EphemeralStorageBrowserTest,
288
297
NavigatingClearsEphemeralStorage) {
298
+ BlockThirdPartyCookies ();
299
+
289
300
ui_test_utils::NavigateToURL (browser (), a_site_ephemeral_storage_url_);
290
301
auto * web_contents = browser ()->tab_strip_model ()->GetActiveWebContents ();
291
302
@@ -324,6 +335,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
324
335
325
336
IN_PROC_BROWSER_TEST_F (EphemeralStorageBrowserTest,
326
337
ClosingTabClearsEphemeralStorage) {
338
+ BlockThirdPartyCookies ();
339
+
327
340
WebContents* site_a_tab = LoadURLInNewTab (a_site_ephemeral_storage_url_);
328
341
EXPECT_EQ (browser ()->tab_strip_model ()->count (), 2 );
329
342
@@ -372,6 +385,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
372
385
373
386
IN_PROC_BROWSER_TEST_F (EphemeralStorageBrowserTest,
374
387
ReloadDoesNotClearEphemeralStorage) {
388
+ BlockThirdPartyCookies ();
389
+
375
390
ui_test_utils::NavigateToURL (browser (), a_site_ephemeral_storage_url_);
376
391
auto * web_contents = browser ()->tab_strip_model ()->GetActiveWebContents ();
377
392
@@ -409,6 +424,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
409
424
410
425
IN_PROC_BROWSER_TEST_F (EphemeralStorageBrowserTest,
411
426
EphemeralStorageDoesNotLeakBetweenProfiles) {
427
+ BlockThirdPartyCookies ();
428
+
412
429
ui_test_utils::NavigateToURL (browser (), a_site_ephemeral_storage_url_);
413
430
auto * web_contents = browser ()->tab_strip_model ()->GetActiveWebContents ();
414
431
@@ -472,6 +489,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
472
489
473
490
IN_PROC_BROWSER_TEST_F (EphemeralStorageBrowserTest,
474
491
NavigationCookiesArePartitioned) {
492
+ BlockThirdPartyCookies ();
493
+
475
494
GURL a_site_set_cookie_url = https_server_.GetURL (
476
495
" a.com" , " /set-cookie?name=acom;path=/;SameSite=None;Secure" );
477
496
GURL b_site_set_cookie_url = https_server_.GetURL (
@@ -523,6 +542,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
523
542
524
543
IN_PROC_BROWSER_TEST_F (EphemeralStorageBrowserTest,
525
544
FirstPartyNestedInThirdParty) {
545
+ BlockThirdPartyCookies ();
546
+
526
547
auto * web_contents = browser ()->tab_strip_model ()->GetActiveWebContents ();
527
548
528
549
GURL a_site_set_cookie_url = https_server_.GetURL (
@@ -718,6 +739,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageDisabledBrowserTest,
718
739
719
740
IN_PROC_BROWSER_TEST_F (EphemeralStorageDisabledBrowserTest,
720
741
ThirdPartyCookiesDisabled) {
742
+ BlockThirdPartyCookies ();
743
+
721
744
ui_test_utils::NavigateToURL (browser (), b_site_ephemeral_storage_url_);
722
745
auto * web_contents = browser ()->tab_strip_model ()->GetActiveWebContents ();
723
746
// We set a value in the page where all the frames are first-party.
@@ -747,7 +770,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageDisabledBrowserTest,
747
770
748
771
IN_PROC_BROWSER_TEST_F (EphemeralStorageDisabledBrowserTest,
749
772
ThirdPartyCookiesDisabledAndNavigateCookies) {
750
- AllowAllCookies ();
773
+ BlockThirdPartyCookies ();
751
774
752
775
GURL b_site_set_cookie_url = https_server_.GetURL (
753
776
" b.com" , " /set-cookie?name=bcom;path=/;SameSite=None;Secure" );
0 commit comments