| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/prefs/pref_service.h" | 5 #include "base/prefs/pref_service.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/content_settings/cookie_settings.h" | 9 #include "chrome/browser/content_settings/cookie_settings.h" |
| 10 #include "chrome/browser/content_settings/host_content_settings_map.h" | 10 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 CONTENT_SETTINGS_TYPE_IMAGES, | 83 CONTENT_SETTINGS_TYPE_IMAGES, |
| 84 std::string())); | 84 std::string())); |
| 85 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 85 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 86 map->GetContentSetting(example_url, | 86 map->GetContentSetting(example_url, |
| 87 example_url, | 87 example_url, |
| 88 CONTENT_SETTINGS_TYPE_JAVASCRIPT, | 88 CONTENT_SETTINGS_TYPE_JAVASCRIPT, |
| 89 std::string())); | 89 std::string())); |
| 90 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 90 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 91 map->GetContentSetting(example_url, | 91 map->GetContentSetting(example_url, |
| 92 example_url, | 92 example_url, |
| 93 CONTENT_SETTINGS_TYPE_MEDIA, |
| 94 std::string())); |
| 95 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 96 map->GetContentSetting(example_url, |
| 97 example_url, |
| 93 CONTENT_SETTINGS_TYPE_PLUGINS, | 98 CONTENT_SETTINGS_TYPE_PLUGINS, |
| 94 std::string())); | 99 std::string())); |
| 95 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 100 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 96 map->GetContentSetting(example_url, | 101 map->GetContentSetting(example_url, |
| 97 example_url, | 102 example_url, |
| 98 CONTENT_SETTINGS_TYPE_POPUPS, | 103 CONTENT_SETTINGS_TYPE_POPUPS, |
| 99 std::string())); | 104 std::string())); |
| 100 #if 0 | 105 #if 0 |
| 101 // TODO(bauerb): Enable once geolocation settings are integrated into the | 106 // TODO(bauerb): Enable once geolocation settings are integrated into the |
| 102 // HostContentSettingsMap. | 107 // HostContentSettingsMap. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 116 GURL url("http://www.google.com"); | 121 GURL url("http://www.google.com"); |
| 117 EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(url, url)); | 122 EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(url, url)); |
| 118 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 123 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 119 map->GetContentSetting( | 124 map->GetContentSetting( |
| 120 url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); | 125 url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); |
| 121 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 126 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 122 map->GetContentSetting( | 127 map->GetContentSetting( |
| 123 url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); | 128 url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); |
| 124 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 129 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 125 map->GetContentSetting( | 130 map->GetContentSetting( |
| 131 url, url, CONTENT_SETTINGS_TYPE_MEDIA, std::string())); |
| 132 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 133 map->GetContentSetting( |
| 126 url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string())); | 134 url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string())); |
| 127 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 135 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 128 map->GetContentSetting( | 136 map->GetContentSetting( |
| 129 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); | 137 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); |
| 130 #if 0 | 138 #if 0 |
| 131 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 139 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 132 map->GetContentSetting( | 140 map->GetContentSetting( |
| 133 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); | 141 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); |
| 134 #endif | 142 #endif |
| 135 EXPECT_EQ( | 143 EXPECT_EQ( |
| (...skipping 14 matching lines...) Expand all Loading... |
| 150 EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(url, url)); | 158 EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(url, url)); |
| 151 EXPECT_FALSE(cookie_settings->IsCookieSessionOnly(url)); | 159 EXPECT_FALSE(cookie_settings->IsCookieSessionOnly(url)); |
| 152 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 160 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 153 map->GetContentSetting( | 161 map->GetContentSetting( |
| 154 url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); | 162 url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); |
| 155 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 163 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 156 map->GetContentSetting( | 164 map->GetContentSetting( |
| 157 url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); | 165 url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); |
| 158 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 166 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 159 map->GetContentSetting( | 167 map->GetContentSetting( |
| 168 url, url, CONTENT_SETTINGS_TYPE_MEDIA, std::string())); |
| 169 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 170 map->GetContentSetting( |
| 160 url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string())); | 171 url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string())); |
| 161 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 172 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 162 map->GetContentSetting( | 173 map->GetContentSetting( |
| 163 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); | 174 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); |
| 164 #if 0 | 175 #if 0 |
| 165 // TODO(bauerb): Enable once geolocation settings are integrated into the | 176 // TODO(bauerb): Enable once geolocation settings are integrated into the |
| 166 // HostContentSettingsMap. | 177 // HostContentSettingsMap. |
| 167 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 178 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 168 map->GetContentSetting( | 179 map->GetContentSetting( |
| 169 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); | 180 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 base::FilePath(kBarPath), | 240 base::FilePath(kBarPath), |
| 230 base::ASCIIToUTF16("2.3.4"), | 241 base::ASCIIToUTF16("2.3.4"), |
| 231 base::ASCIIToUTF16("bar")), | 242 base::ASCIIToUTF16("bar")), |
| 232 false); | 243 false); |
| 233 | 244 |
| 234 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) | 245 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) |
| 235 << message_; | 246 << message_; |
| 236 } | 247 } |
| 237 | 248 |
| 238 } // namespace extensions | 249 } // namespace extensions |
| OLD | NEW |