| 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 0018d7f43e6d67de1cbcaab26425e1d46cd94e11..498252904bc0abcd64bfc839ad373e25be7f4ea7 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| @@ -914,36 +914,32 @@ TEST_F(HostContentSettingsMapTest, GetContentSetting) {
|
| }
|
|
|
| TEST_F(HostContentSettingsMapTest, ShouldAllowAllContent) {
|
| - TestingProfile profile;
|
| - HostContentSettingsMap* host_content_settings_map =
|
| - profile.GetHostContentSettingsMap();
|
| -
|
| GURL http_host("http://example.com/");
|
| GURL https_host("https://example.com/");
|
| GURL embedder("chrome://foo");
|
| GURL extension("chrome-extension://foo");
|
| - EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_FALSE(HostContentSettingsMap::ShouldAllowAllContent(
|
| http_host, embedder, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
|
| - EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_FALSE(HostContentSettingsMap::ShouldAllowAllContent(
|
| http_host, embedder, CONTENT_SETTINGS_TYPE_GEOLOCATION));
|
| - EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_FALSE(HostContentSettingsMap::ShouldAllowAllContent(
|
| http_host, embedder, CONTENT_SETTINGS_TYPE_COOKIES));
|
| - EXPECT_TRUE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_TRUE(HostContentSettingsMap::ShouldAllowAllContent(
|
| https_host, embedder, CONTENT_SETTINGS_TYPE_COOKIES));
|
| - EXPECT_TRUE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_TRUE(HostContentSettingsMap::ShouldAllowAllContent(
|
| https_host, embedder, CONTENT_SETTINGS_TYPE_COOKIES));
|
| - EXPECT_TRUE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_TRUE(HostContentSettingsMap::ShouldAllowAllContent(
|
| embedder, http_host, CONTENT_SETTINGS_TYPE_COOKIES));
|
| #if defined(ENABLE_EXTENSIONS)
|
| - EXPECT_TRUE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_TRUE(HostContentSettingsMap::ShouldAllowAllContent(
|
| extension, extension, CONTENT_SETTINGS_TYPE_COOKIES));
|
| #else
|
| - EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_FALSE(HostContentSettingsMap::ShouldAllowAllContent(
|
| extension, extension, CONTENT_SETTINGS_TYPE_COOKIES));
|
| #endif
|
| - EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_FALSE(HostContentSettingsMap::ShouldAllowAllContent(
|
| extension, extension, CONTENT_SETTINGS_TYPE_PLUGINS));
|
| - EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(
|
| + EXPECT_FALSE(HostContentSettingsMap::ShouldAllowAllContent(
|
| extension, http_host, CONTENT_SETTINGS_TYPE_COOKIES));
|
| }
|
|
|
|
|