Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc |
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc |
index 498252904bc0abcd64bfc839ad373e25be7f4ea7..0c96f982800e0b6a90354f2b6cb7871bb1ee3886 100644 |
--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc |
+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc |
@@ -56,13 +56,23 @@ TEST_F(HostContentSettingsMapTest, DefaultValues) { |
GURL(chrome::kChromeUINewTabURL), |
CONTENT_SETTINGS_TYPE_IMAGES, |
std::string())); |
- { |
- host_content_settings_map->SetDefaultContentSetting( |
- CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ASK); |
- EXPECT_EQ(CONTENT_SETTING_ASK, |
- host_content_settings_map->GetDefaultContentSetting( |
- CONTENT_SETTINGS_TYPE_PLUGINS, NULL)); |
- } |
+ |
+ host_content_settings_map->SetDefaultContentSetting( |
+ CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ALLOW); |
+ EXPECT_EQ(CONTENT_SETTING_ALLOW, |
+ host_content_settings_map->GetDefaultContentSetting( |
+ CONTENT_SETTINGS_TYPE_PLUGINS, NULL)); |
+ host_content_settings_map->SetDefaultContentSetting( |
+ CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); |
+ EXPECT_EQ(CONTENT_SETTING_BLOCK, |
+ host_content_settings_map->GetDefaultContentSetting( |
+ CONTENT_SETTINGS_TYPE_PLUGINS, NULL)); |
+ host_content_settings_map->SetDefaultContentSetting( |
+ CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT); |
+ EXPECT_EQ(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, |
+ host_content_settings_map->GetDefaultContentSetting( |
+ CONTENT_SETTINGS_TYPE_PLUGINS, NULL)); |
+ |
host_content_settings_map->SetDefaultContentSetting( |
CONTENT_SETTINGS_TYPE_POPUPS, CONTENT_SETTING_ALLOW); |
EXPECT_EQ(CONTENT_SETTING_ALLOW, |