Adding <keygen> Content Setting (core)

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/location.h"
 #include "base/prefs/pref_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 74 matching lines @@
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               map->GetContentSetting(example_url,
                                      example_url,
                                      CONTENT_SETTINGS_TYPE_IMAGES,
                                      std::string()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(example_url,
                                      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,
                                      CONTENT_SETTINGS_TYPE_PLUGINS,
                                      std::string()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(example_url,
                                      example_url,
                                      CONTENT_SETTINGS_TYPE_POPUPS,
                                      std::string()));
@@ skipping 40 matching lines @@
 
     // Check content settings for www.google.com
     GURL url("http://www.google.com");
     EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(url, url));
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
     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()));
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
     EXPECT_EQ(
@@ skipping 31 matching lines @@
     GURL url("http://www.google.com");
     EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(url, url));
     EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(url, url));
     EXPECT_FALSE(cookie_settings->IsCookieSessionOnly(url));
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
     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()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
     EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
     EXPECT_EQ(
@@ skipping 82 matching lines @@
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest,
                        UnsupportedDefaultSettings) {
   const char kExtensionPath[] = "content_settings/unsupporteddefaultsettings";
   EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_;
 }
 
 }  // namespace extensions