[subresource_filter] Clean up special cases in TabSpecificContentSettings

chrome/browser/ui/content_settings/content_setting_image_model.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 "chrome/browser/ui/content_settings/content_setting_image_model.h"
 
 #include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
@@ skipping 408 matching lines @@
 
 void ContentSettingSubresourceFilterImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
 
   if (!web_contents)
     return;
 
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
-
-  if (!content_settings || !content_settings->IsSubresourceBlocked())
+  if (!content_settings || !content_settings->IsContentBlocked(
+                               CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER)) {
     return;
+  }
 
   set_icon(kSubresourceFilterActiveIcon, kBlockedBadgeIcon);
   set_explanatory_string_id(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE);
   set_tooltip(
       l10n_util::GetStringUTF16(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE));
   set_visible(true);
 }
 
 ContentSettingBubbleModel*
 ContentSettingSubresourceFilterImageModel::CreateBubbleModel(
     ContentSettingBubbleModel::Delegate* delegate,
     WebContents* web_contents,
     Profile* profile) {
   return new ContentSettingSubresourceFilterBubbleModel(delegate, web_contents,
                                                         profile);
 }
 
 bool ContentSettingSubresourceFilterImageModel::ShouldRunAnimation(
     WebContents* web_contents) {
   if (!web_contents)
     return false;
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
-  return content_settings &&
-         !content_settings->IsSubresourceBlockageIndicated();
+  return content_settings && !content_settings->IsBlockageIndicated(
+                                 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER);
 }
 
 void ContentSettingSubresourceFilterImageModel::SetAnimationHasRun(
     WebContents* web_contents) {
   if (!web_contents)
     return;
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
-  if (content_settings)
-    content_settings->SetSubresourceBlockageIndicated();
+  if (content_settings) {
+    content_settings->SetBlockageHasBeenIndicated(
+        CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER);
+  }
 }
 
 // Protocol handlers -----------------------------------------------------------
 
 ContentSettingRPHImageModel::ContentSettingRPHImageModel()
     : ContentSettingSimpleImageModel(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
   set_icon(ui::kProtocolHandlerIcon, gfx::kNoneIcon);
   set_tooltip(l10n_util::GetStringUTF16(IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP));
 }
 
@@ skipping 154 matching lines @@
 
 #if defined(OS_MACOSX)
 bool ContentSettingImageModel::UpdateFromWebContentsAndCheckIfIconChanged(
     content::WebContents* web_contents) {
   const gfx::VectorIcon* old_icon = icon_;
   const gfx::VectorIcon* old_badge_icon = icon_badge_;
   UpdateFromWebContents(web_contents);
   return old_icon != icon_ && old_badge_icon != icon_badge_;
 }
 #endif