chrome/browser/content_settings/tab_specific_content_settings_unittest.cc - Issue 27635002: Content settings for <audio> and <video>.

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

Issue 27635002: Content settings for <audio> and <video>. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test fix. Created 6 years, 6 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

« chrome/browser/content_settings/content_settings_policy_provider.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('j') | chrome/browser/prefs/pref_functional_browsertest.cc » ('J')
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 5d08a4b018b52ab7f8856d65f07e01a204646c24..41bac7498627e693e48fb140eb181a6f6dbe6101 100644

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

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

@@ -55,6 +55,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));

EXPECT_FALSE(

+ content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIA));

+ EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));

@@ -82,6 +84,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));

EXPECT_FALSE(

+ content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIA));

+ EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));

@@ -105,6 +109,10 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {

EXPECT_TRUE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));

+ // Block media.

+ content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_MEDIA);

+ EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIA));

// Reset blocked content settings.

content_settings->ClearBlockedContentSettingsExceptForCookies();

EXPECT_FALSE(

@@ -112,6 +120,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));

EXPECT_FALSE(

+ content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIA));

+ EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));

EXPECT_TRUE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));

@@ -128,6 +138,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));

EXPECT_FALSE(

+ content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIA));

+ EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));

EXPECT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));

@@ -163,6 +175,8 @@ TEST_F(TabSpecificContentSettingsTest, AllowedContent) {

ASSERT_FALSE(

content_settings->IsContentAllowed(CONTENT_SETTINGS_TYPE_IMAGES));

ASSERT_FALSE(

+ content_settings->IsContentAllowed(CONTENT_SETTINGS_TYPE_MEDIA));

+ ASSERT_FALSE(

content_settings->IsContentAllowed(CONTENT_SETTINGS_TYPE_COOKIES));

ASSERT_FALSE(

content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));