chrome/browser/content_settings/tab_specific_content_settings_unittest.cc - Issue 2377603002: Disable ServiceWorker when JS is disabled

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

Issue 2377603002: Disable ServiceWorker when JS is disabled (Closed)

Patch Set: Updated comments, removed the mock headers and renamed the function Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

index ebb6a5e4e3ccefb27999f70f91217ae8ca75ebbe..50b1488c28735650caab62f74ffd9ce008bffece 100644

--- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

+++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

@@ -126,15 +126,22 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {

EXPECT_TRUE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));

+ // Block a javascript during a navigation.

+ content_settings->OnServiceWorkerAccessed(GURL("http://google.com"),

+ true, false);

+ EXPECT_TRUE(

+ content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));

// Reset blocked content settings.

- content_settings->ClearBlockedContentSettingsExceptForCookies();

+ content_settings

+ ->ClearContentSettingsExceptForNavigationRelatedSettings();

#if !defined(OS_ANDROID)

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));

#endif

- EXPECT_FALSE(

+ EXPECT_TRUE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));

EXPECT_TRUE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));

@@ -147,7 +154,7 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));

- content_settings->ClearCookieSpecificContentSettings();

+ content_settings->ClearNavigationRelatedContentSettings();

#if !defined(OS_ANDROID)

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));