| 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 d53724694d58f9469cf5988d24d85388c48b599c..e0fc92c338cd4073622841f297a8ab9efb502838 100644
|
| --- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
|
| +++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
|
| @@ -64,6 +64,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
|
| EXPECT_FALSE(content_settings->IsContentBlocked(
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
|
| + EXPECT_FALSE(
|
| + content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));
|
|
|
| // Set a cookie, block access to images, block mediastream access and block a
|
| // popup.
|
| @@ -100,6 +102,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
|
| EXPECT_TRUE(content_settings->IsContentBlocked(
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
|
| + EXPECT_FALSE(
|
| + content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));
|
| content_settings->OnCookieChanged(GURL("http://google.com"),
|
| GURL("http://google.com"),
|
| "A=B",
|
| @@ -131,6 +135,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
|
| EXPECT_FALSE(content_settings->IsContentBlocked(
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
|
| + EXPECT_FALSE(
|
| + content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));
|
|
|
| content_settings->ClearCookieSpecificContentSettings();
|
| EXPECT_FALSE(
|
| @@ -147,6 +153,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
|
| EXPECT_FALSE(content_settings->IsContentBlocked(
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
|
| + EXPECT_FALSE(
|
| + content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));
|
| }
|
|
|
| TEST_F(TabSpecificContentSettingsTest, BlockedFileSystems) {
|
|
|