Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/content_settings/host_content_settings_map_unittest.cc

Issue 7828022: Add a method to the HostContentSettings map to return the |Value| of a content setting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update example value of AutoSelectCertificate policy in policy_template.json Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« chrome/browser/content_settings/host_content_settings_map.cc ('K') | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/policy/configuration_policy_pref_store.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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_AUTO_SELECT_CERTIFICATE] =
161 CONTENT_SETTING_ASK;
162 ContentSettings settings = 160 ContentSettings settings =
163 host_content_settings_map->GetContentSettings(host, host); 161 host_content_settings_map->GetContentSettings(host, host);
164 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); 162 EXPECT_TRUE(SettingsEqual(desired_settings, settings));
165 163
166 // Check returning all hosts for a setting. 164 // Check returning all hosts for a setting.
167 ContentSettingsPattern pattern2 = 165 ContentSettingsPattern pattern2 =
168 ContentSettingsPattern::FromString("[*.]example.org"); 166 ContentSettingsPattern::FromString("[*.]example.org");
169 host_content_settings_map->SetContentSetting( 167 host_content_settings_map->SetContentSetting(
170 pattern2, 168 pattern2,
171 ContentSettingsPattern::Wildcard(), 169 ContentSettingsPattern::Wildcard(),
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] = 598 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] =
601 CONTENT_SETTING_BLOCK; 599 CONTENT_SETTING_BLOCK;
602 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] = 600 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] =
603 CONTENT_SETTING_BLOCK; 601 CONTENT_SETTING_BLOCK;
604 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] = 602 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] =
605 CONTENT_SETTING_ASK; 603 CONTENT_SETTING_ASK;
606 desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] = 604 desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] =
607 CONTENT_SETTING_ASK; 605 CONTENT_SETTING_ASK;
608 desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS] = 606 desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS] =
609 CONTENT_SETTING_ASK; 607 CONTENT_SETTING_ASK;
610 desired_settings.settings[CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE] =
611 CONTENT_SETTING_ASK;
612 ContentSettings settings = 608 ContentSettings settings =
613 host_content_settings_map->GetContentSettings(host, host); 609 host_content_settings_map->GetContentSettings(host, host);
614 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); 610 EXPECT_TRUE(SettingsEqual(desired_settings, settings));
615 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES], 611 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES],
616 settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]); 612 settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]);
617 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES], 613 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES],
618 settings.settings[CONTENT_SETTINGS_TYPE_IMAGES]); 614 settings.settings[CONTENT_SETTINGS_TYPE_IMAGES]);
619 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS], 615 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS],
620 settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS]); 616 settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS]);
621 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS], 617 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS],
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 TEST_F(HostContentSettingsMapTest, NonDefaultSettings) { 790 TEST_F(HostContentSettingsMapTest, NonDefaultSettings) {
795 TestingProfile profile; 791 TestingProfile profile;
796 HostContentSettingsMap* host_content_settings_map = 792 HostContentSettingsMap* host_content_settings_map =
797 profile.GetHostContentSettingsMap(); 793 profile.GetHostContentSettingsMap();
798 794
799 GURL host("http://example.com/"); 795 GURL host("http://example.com/");
800 ContentSettingsPattern pattern = 796 ContentSettingsPattern pattern =
801 ContentSettingsPattern::FromString("[*.]example.com"); 797 ContentSettingsPattern::FromString("[*.]example.com");
802 798
803 ContentSettings desired_settings(CONTENT_SETTING_DEFAULT); 799 ContentSettings desired_settings(CONTENT_SETTING_DEFAULT);
804 desired_settings.settings[CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE] =
805 CONTENT_SETTING_ASK;
806 ContentSettings settings = 800 ContentSettings settings =
807 host_content_settings_map->GetNonDefaultContentSettings(host, host); 801 host_content_settings_map->GetNonDefaultContentSettings(host, host);
808 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); 802 EXPECT_TRUE(SettingsEqual(desired_settings, settings));
809 803
810 host_content_settings_map->SetContentSetting( 804 host_content_settings_map->SetContentSetting(
811 pattern, 805 pattern,
812 ContentSettingsPattern::Wildcard(), 806 ContentSettingsPattern::Wildcard(),
813 CONTENT_SETTINGS_TYPE_IMAGES, 807 CONTENT_SETTINGS_TYPE_IMAGES,
814 "", 808 "",
815 CONTENT_SETTING_BLOCK); 809 CONTENT_SETTING_BLOCK);
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 EXPECT_EQ(CONTENT_SETTING_ALLOW, 1261 EXPECT_EQ(CONTENT_SETTING_ALLOW,
1268 host_content_settings_map->GetCookieContentSetting( 1262 host_content_settings_map->GetCookieContentSetting(
1269 kAllowedSite, kFirstPartySite, true)); 1263 kAllowedSite, kFirstPartySite, true));
1270 EXPECT_EQ(CONTENT_SETTING_ALLOW, 1264 EXPECT_EQ(CONTENT_SETTING_ALLOW,
1271 host_content_settings_map->GetCookieContentSetting( 1265 host_content_settings_map->GetCookieContentSetting(
1272 kAllowedSite, kAllowedSite, false)); 1266 kAllowedSite, kAllowedSite, false));
1273 EXPECT_EQ(CONTENT_SETTING_ALLOW, 1267 EXPECT_EQ(CONTENT_SETTING_ALLOW,
1274 host_content_settings_map->GetCookieContentSetting( 1268 host_content_settings_map->GetCookieContentSetting(
1275 kAllowedSite, kAllowedSite, true)); 1269 kAllowedSite, kAllowedSite, true));
1276 } 1270 }
OLDNEW
« chrome/browser/content_settings/host_content_settings_map.cc ('K') | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/policy/configuration_policy_pref_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698