| 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 0342cac351efd90c61e3a42c37f096ba1ad1b8e3..1532e97e05c277bbe8f931f0b235ccf1b60acab3 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| @@ -81,11 +81,6 @@ class TesterForType {
|
| new base::FundamentalValue(setting));
|
| }
|
|
|
| - bool AreUserExceptionsAllowed() {
|
| - return host_content_settings_map_->AreUserExceptionsAllowedForType(
|
| - content_type_);
|
| - }
|
| -
|
| void AddUserException(std::string exception,
|
| ContentSetting content_settings) {
|
| ContentSettingsPattern pattern =
|
| @@ -869,32 +864,6 @@ TEST_F(HostContentSettingsMapTest, OffTheRecordDontInheritSetting) {
|
| std::string(), nullptr));
|
| }
|
|
|
| -TEST_F(HostContentSettingsMapTest, AreUserExceptionsAllowedForType) {
|
| - ContentSettingsType kContentTypesToTest[] = {
|
| - CONTENT_SETTINGS_TYPE_COOKIES,
|
| - CONTENT_SETTINGS_TYPE_POPUPS,
|
| - };
|
| -
|
| - TestingProfile profile;
|
| -
|
| - for (ContentSettingsType type : kContentTypesToTest) {
|
| - TesterForType tester(&profile, type);
|
| -
|
| - // No settings: Yes.
|
| - tester.ClearPolicyDefault();
|
| - EXPECT_TRUE(tester.AreUserExceptionsAllowed());
|
| -
|
| - // Policy enforces default value: No.
|
| - tester.SetPolicyDefault(CONTENT_SETTING_ALLOW);
|
| - EXPECT_FALSE(tester.AreUserExceptionsAllowed());
|
| - tester.SetPolicyDefault(CONTENT_SETTING_BLOCK);
|
| - EXPECT_FALSE(tester.AreUserExceptionsAllowed());
|
| -
|
| - // Cleanup for next iteration.
|
| - tester.ClearPolicyDefault();
|
| - }
|
| -}
|
| -
|
| TEST_F(HostContentSettingsMapTest, PrefExceptionsOperation) {
|
| using content_settings::SETTING_SOURCE_POLICY;
|
| using content_settings::SETTING_SOURCE_USER;
|
|
|