chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 1417173010: Adding <keygen> Content Setting (core)

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 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removing test_runner. Created 5 years, 1 month 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_unittest.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | components/content_settings/core/browser/content_settings_policy_provider.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 62f75e2b3d6ce7d2ddbf4dbf503da597abebf256..07fd989c72ca14f7dfb81d59884e1bd478a892af 100644

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

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

@@ -92,6 +92,10 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

example_url,

CONTENT_SETTINGS_TYPE_JAVASCRIPT,

std::string()));

+ EXPECT_EQ(

+ CONTENT_SETTING_BLOCK,

+ map->GetContentSetting(example_url, example_url,

+ CONTENT_SETTINGS_TYPE_KEYGEN, std::string()));

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(example_url,

example_url,

@@ -152,6 +156,9 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

EXPECT_EQ(CONTENT_SETTING_BLOCK,

map->GetContentSetting(

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

+ EXPECT_EQ(CONTENT_SETTING_BLOCK,

+ map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_KEYGEN,

+ std::string()));

EXPECT_EQ(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,

map->GetContentSetting(

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

@@ -203,6 +210,9 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(

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

+ EXPECT_EQ(CONTENT_SETTING_BLOCK,

+ map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_KEYGEN,

+ std::string()));

EXPECT_EQ(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,

map->GetContentSetting(

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