Remove HostContentSettingsMap::IsSettingAllowedForType

chrome/browser/content_settings/host_content_settings_map_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 940 matching lines @@
       std::string(),
       CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 embedder, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
 }
 
-TEST_F(HostContentSettingsMapTest, IsSettingAllowedForType) {
-  TestingProfile profile;
-  PrefService* prefs = profile.GetPrefs();
-
-  EXPECT_TRUE(HostContentSettingsMap::IsSettingAllowedForType(
-                  prefs, CONTENT_SETTING_ASK,
-                  CONTENT_SETTINGS_TYPE_FULLSCREEN));
-
-  // The mediastream setting is deprecated.
-  EXPECT_FALSE(HostContentSettingsMap::IsSettingAllowedForType(
-                   prefs, CONTENT_SETTING_ALLOW,
-                   CONTENT_SETTINGS_TYPE_MEDIASTREAM));
-  EXPECT_FALSE(HostContentSettingsMap::IsSettingAllowedForType(
-                   prefs, CONTENT_SETTING_ASK,
-                   CONTENT_SETTINGS_TYPE_MEDIASTREAM));
-  EXPECT_FALSE(HostContentSettingsMap::IsSettingAllowedForType(
-                   prefs, CONTENT_SETTING_BLOCK,
-                   CONTENT_SETTINGS_TYPE_MEDIASTREAM));
-
-  // We support the ALLOW value for media permission exceptions,
-  // but not as the default setting.
-  EXPECT_TRUE(HostContentSettingsMap::IsSettingAllowedForType(
-                  prefs, CONTENT_SETTING_ALLOW,
-                  CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
-  EXPECT_TRUE(HostContentSettingsMap::IsSettingAllowedForType(
-                  prefs, CONTENT_SETTING_ALLOW,
-                  CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
+TEST_F(HostContentSettingsMapTest, IsDefaultSettingAllowedForType) {
   EXPECT_FALSE(HostContentSettingsMap::IsDefaultSettingAllowedForType(
-                   prefs, CONTENT_SETTING_ALLOW,
-                   CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
+      CONTENT_SETTING_ALLOW, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   EXPECT_FALSE(HostContentSettingsMap::IsDefaultSettingAllowedForType(
-                   prefs, CONTENT_SETTING_ALLOW,
-                   CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-
-  // TODO(msramek): Add more checks for setting type - setting pairs where
-  // it is not obvious whether or not they are allowed.
+      CONTENT_SETTING_ALLOW, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
 }
 
 TEST_F(HostContentSettingsMapTest, AddContentSettingsObserver) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
   content_settings::MockObserver mock_observer;
 
   GURL host("http://example.com/");
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
   EXPECT_CALL(mock_observer,
               OnContentSettingChanged(pattern,
                                       ContentSettingsPattern::Wildcard(),
                                       CONTENT_SETTINGS_TYPE_IMAGES,
                                       ""));
 
   host_content_settings_map->AddObserver(&mock_observer);
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
   host_content_settings_map->SetContentSetting(
       pattern,
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
       CONTENT_SETTING_DEFAULT);
 }