| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/auto_reset.h" | 5 #include "base/auto_reset.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "chrome/browser/content_settings/content_settings_details.h" | 9 #include "chrome/browser/content_settings/content_settings_details.h" |
| 10 #include "chrome/browser/content_settings/host_content_settings_map.h" | 10 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] = | 150 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] = |
| 151 CONTENT_SETTING_ALLOW; | 151 CONTENT_SETTING_ALLOW; |
| 152 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] = | 152 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] = |
| 153 CONTENT_SETTING_BLOCK; | 153 CONTENT_SETTING_BLOCK; |
| 154 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] = | 154 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] = |
| 155 CONTENT_SETTING_ASK; | 155 CONTENT_SETTING_ASK; |
| 156 desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] = | 156 desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] = |
| 157 CONTENT_SETTING_ASK; | 157 CONTENT_SETTING_ASK; |
| 158 desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS] = | 158 desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS] = |
| 159 CONTENT_SETTING_ASK; | 159 CONTENT_SETTING_ASK; |
| 160 desired_settings.settings[CONTENT_SETTINGS_TYPE_FULLSCREEN] = |
| 161 CONTENT_SETTING_ASK; |
| 160 ContentSettings settings = | 162 ContentSettings settings = |
| 161 host_content_settings_map->GetContentSettings(host, host); | 163 host_content_settings_map->GetContentSettings(host, host); |
| 162 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); | 164 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); |
| 163 | 165 |
| 164 // Check returning all hosts for a setting. | 166 // Check returning all hosts for a setting. |
| 165 ContentSettingsPattern pattern2 = | 167 ContentSettingsPattern pattern2 = |
| 166 ContentSettingsPattern::FromString("[*.]example.org"); | 168 ContentSettingsPattern::FromString("[*.]example.org"); |
| 167 host_content_settings_map->SetContentSetting( | 169 host_content_settings_map->SetContentSetting( |
| 168 pattern2, | 170 pattern2, |
| 169 ContentSettingsPattern::Wildcard(), | 171 ContentSettingsPattern::Wildcard(), |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] = | 604 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] = |
| 603 CONTENT_SETTING_BLOCK; | 605 CONTENT_SETTING_BLOCK; |
| 604 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] = | 606 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] = |
| 605 CONTENT_SETTING_BLOCK; | 607 CONTENT_SETTING_BLOCK; |
| 606 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] = | 608 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] = |
| 607 CONTENT_SETTING_ASK; | 609 CONTENT_SETTING_ASK; |
| 608 desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] = | 610 desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] = |
| 609 CONTENT_SETTING_ASK; | 611 CONTENT_SETTING_ASK; |
| 610 desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS] = | 612 desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS] = |
| 611 CONTENT_SETTING_ASK; | 613 CONTENT_SETTING_ASK; |
| 614 desired_settings.settings[CONTENT_SETTINGS_TYPE_FULLSCREEN] = |
| 615 CONTENT_SETTING_ASK; |
| 612 ContentSettings settings = | 616 ContentSettings settings = |
| 613 host_content_settings_map->GetContentSettings(host, host); | 617 host_content_settings_map->GetContentSettings(host, host); |
| 614 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); | 618 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); |
| 615 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES], | 619 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES], |
| 616 settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]); | 620 settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]); |
| 617 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES], | 621 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES], |
| 618 settings.settings[CONTENT_SETTINGS_TYPE_IMAGES]); | 622 settings.settings[CONTENT_SETTINGS_TYPE_IMAGES]); |
| 619 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS], | 623 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS], |
| 620 settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS]); | 624 settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS]); |
| 621 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS], | 625 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS], |
| 622 settings.settings[CONTENT_SETTINGS_TYPE_POPUPS]); | 626 settings.settings[CONTENT_SETTINGS_TYPE_POPUPS]); |
| 623 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION], | 627 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION], |
| 624 settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION]); | 628 settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION]); |
| 625 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES], | 629 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES], |
| 626 settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]); | 630 settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]); |
| 627 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS], | 631 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS], |
| 628 settings.settings[CONTENT_SETTINGS_TYPE_INTENTS]); | 632 settings.settings[CONTENT_SETTINGS_TYPE_INTENTS]); |
| 633 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_FULLSCREEN], |
| 634 settings.settings[CONTENT_SETTINGS_TYPE_FULLSCREEN]); |
| 629 } | 635 } |
| 630 | 636 |
| 631 TEST_F(HostContentSettingsMapTest, OffTheRecord) { | 637 TEST_F(HostContentSettingsMapTest, OffTheRecord) { |
| 632 TestingProfile profile; | 638 TestingProfile profile; |
| 633 HostContentSettingsMap* host_content_settings_map = | 639 HostContentSettingsMap* host_content_settings_map = |
| 634 profile.GetHostContentSettingsMap(); | 640 profile.GetHostContentSettingsMap(); |
| 635 scoped_refptr<HostContentSettingsMap> otr_map( | 641 scoped_refptr<HostContentSettingsMap> otr_map( |
| 636 new HostContentSettingsMap(profile.GetPrefs(), | 642 new HostContentSettingsMap(profile.GetPrefs(), |
| 637 profile.GetExtensionService(), | 643 profile.GetExtensionService(), |
| 638 true)); | 644 true)); |
| (...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1230 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 1236 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 1231 host_content_settings_map->GetCookieContentSetting( | 1237 host_content_settings_map->GetCookieContentSetting( |
| 1232 kAllowedSite, kFirstPartySite, true)); | 1238 kAllowedSite, kFirstPartySite, true)); |
| 1233 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 1239 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 1234 host_content_settings_map->GetCookieContentSetting( | 1240 host_content_settings_map->GetCookieContentSetting( |
| 1235 kAllowedSite, kAllowedSite, false)); | 1241 kAllowedSite, kAllowedSite, false)); |
| 1236 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 1242 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 1237 host_content_settings_map->GetCookieContentSetting( | 1243 host_content_settings_map->GetCookieContentSetting( |
| 1238 kAllowedSite, kAllowedSite, true)); | 1244 kAllowedSite, kAllowedSite, true)); |
| 1239 } | 1245 } |
| OLD | NEW |