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

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/extensions/api/content_settings/content_settings_apitest.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_unittest.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_helpers.cc » ('j') | chrome/browser/prefs/pref_functional_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

index a7fae5e44773fcfbc6769ba49179c139c1569727..6e64aac0e1dd15bf3af38b7d0288bc47d6b77469 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -90,6 +90,11 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(example_url,

example_url,

+ CONTENT_SETTINGS_TYPE_MEDIA,

+ std::string()));

+ EXPECT_EQ(CONTENT_SETTING_ALLOW,

+ map->GetContentSetting(example_url,

+ example_url,

CONTENT_SETTINGS_TYPE_PLUGINS,

std::string()));

EXPECT_EQ(CONTENT_SETTING_BLOCK,

@@ -123,6 +128,9 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));

EXPECT_EQ(CONTENT_SETTING_BLOCK,

map->GetContentSetting(

+ url, url, CONTENT_SETTINGS_TYPE_MEDIA, std::string()));

+ EXPECT_EQ(CONTENT_SETTING_BLOCK,

+ map->GetContentSetting(

url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string()));

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(

@@ -157,6 +165,9 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(

+ url, url, CONTENT_SETTINGS_TYPE_MEDIA, std::string()));

+ EXPECT_EQ(CONTENT_SETTING_ALLOW,

+ map->GetContentSetting(

url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string()));

EXPECT_EQ(CONTENT_SETTING_BLOCK,

map->GetContentSetting(