Adding <keygen> Content Setting (core)

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

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(

[msramek, 2015/11/05 17:07:09]

It doesn't make much sense to test the effect of extensions, as you did not
expose this content setting to extensions' API.

That is something that can be easily done in a separate CL, so please remove
this file.

[svaldez, 2015/11/05 17:37:51]

Done.

+        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()));