[subresource_filter] Clean up special cases in TabSpecificContentSettings

chrome/browser/content_settings/tab_specific_content_settings.cc

Index: chrome/browser/content_settings/tab_specific_content_settings.cc
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index bece6fc7644a115a89b7ce41462f9851b0569537..c96b71ae3da9f5ac146465d60c7e81316400c634 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -105,8 +105,6 @@ TabSpecificContentSettings::TabSpecificContentSettings(WebContents* tab)
       pending_protocol_handler_setting_(CONTENT_SETTING_DEFAULT),
       load_plugins_link_enabled_(true),
       microphone_camera_state_(MICROPHONE_CAMERA_NOT_ACCESSED),
-      subresource_filter_enabled_(false),
-      subresource_filter_blockage_indicated_(false),
       observer_(this) {
   ClearContentSettingsExceptForNavigationRelatedSettings();
   ClearNavigationRelatedContentSettings();
@@ -250,7 +248,8 @@ bool TabSpecificContentSettings::IsContentBlocked(
       content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
       content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
       content_type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER ||
-      content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
+      content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX ||
+      content_type == CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER) {
     const auto& it = content_settings_status_.find(content_type);
     if (it != content_settings_status_.end())
       return it->second.blocked;
@@ -259,10 +258,6 @@ bool TabSpecificContentSettings::IsContentBlocked(
   return false;
 }
 
-bool TabSpecificContentSettings::IsSubresourceBlocked() const {
-  return subresource_filter_enabled_;
-}
-
 bool TabSpecificContentSettings::IsBlockageIndicated(
     ContentSettingsType content_type) const {
   const auto& it = content_settings_status_.find(content_type);
@@ -271,19 +266,11 @@ bool TabSpecificContentSettings::IsBlockageIndicated(
   return false;
 }
 
-bool TabSpecificContentSettings::IsSubresourceBlockageIndicated() const {
-  return subresource_filter_blockage_indicated_;
-}
-
 void TabSpecificContentSettings::SetBlockageHasBeenIndicated(
     ContentSettingsType content_type) {
   content_settings_status_[content_type].blockage_indicated_to_user = true;
 }
 
-void TabSpecificContentSettings::SetSubresourceBlockageIndicated() {
-  subresource_filter_blockage_indicated_ = true;
-}
-
 bool TabSpecificContentSettings::IsContentAllowed(
     ContentSettingsType content_type) const {
   DCHECK_NE(CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, content_type)
@@ -710,10 +697,6 @@ void TabSpecificContentSettings::SetPopupsBlocked(bool blocked) {
       content::NotificationService::NoDetails());
 }
 
-void TabSpecificContentSettings::SetSubresourceBlocked(bool enabled) {
-  subresource_filter_enabled_ = enabled;
-}
-
 void TabSpecificContentSettings::SetPepperBrokerAllowed(bool allowed) {
   if (allowed) {
     OnContentAllowed(CONTENT_SETTINGS_TYPE_PPAPI_BROKER);