Remove HostContentSettingsMap::IsSettingAllowedForType

components/content_settings/core/browser/content_settings_info.h

Index: components/content_settings/core/browser/content_settings_info.h
diff --git a/components/content_settings/core/browser/content_settings_info.h b/components/content_settings/core/browser/content_settings_info.h
index 9f336183fc34c3458e130713005fd680be4f4c2e..dcc87b9d999e93386725f601cda9efc2fbfb4d19 100644
--- a/components/content_settings/core/browser/content_settings_info.h
+++ b/components/content_settings/core/browser/content_settings_info.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/macros.h"
+#include "components/content_settings/core/common/content_settings.h"
 
 namespace content_settings {
 
@@ -18,7 +19,8 @@ class ContentSettingsInfo {
  public:
   // This object does not take ownership of |website_settings_info|.
   ContentSettingsInfo(const WebsiteSettingsInfo* website_settings_info,
-                      const std::vector<std::string>& whitelisted_schemes);
+                      const std::vector<std::string>& whitelisted_schemes,
+                      const std::vector<ContentSetting>& valid_settings);

[Bernhard Bauer, 2015/09/28 18:46:09]

std::set? ContentSetting is an integer enum after all.

[raymes, 2015/09/29 05:51:26]

Done.

   ~ContentSettingsInfo();
 
   const WebsiteSettingsInfo* website_settings_info() const {
@@ -28,9 +30,12 @@ class ContentSettingsInfo {
     return whitelisted_schemes_;
   }
 
+  bool IsSettingValid(ContentSetting setting) const;
+
  private:
   const WebsiteSettingsInfo* website_settings_info_;
-  std::vector<std::string> whitelisted_schemes_;
+  const std::vector<std::string> whitelisted_schemes_;
+  const std::vector<ContentSetting> valid_settings_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsInfo);
 };