[subresource_filter] Clean up special cases in TabSpecificContentSettings

chrome/browser/content_settings/tab_specific_content_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 18 matching lines @@
 class HostContentSettingsMap;
 
 namespace content {
 class NavigationHandle;
 }
 
 namespace net {
 class CookieOptions;
 }
 
-// TODO(msramek): Subresource filter and media currently are storing their state
-// in TabSpecificContentSettings: |microphone_camera_state_| and
-// |subresource_filter_enabled_| without being tied either to a single content
-// setting or to any content setting. This state is not ideal, potential
-// solution is to save this information via content::WebContentsUserData
+// TODO(msramek): Media is storing their state in TabSpecificContentSettings:
+// |microphone_camera_state_| without being tied to a single content setting.
+// This state is not ideal, potential solution is to save this information via
+// content::WebContentsUserData
 
 // This class manages state about permissions, content settings, cookies and
 // site data for a specific WebContents. It tracks which content was accessed
 // and which content was blocked. Based on this it provides information about
 // which types of content were accessed and blocked.
 class TabSpecificContentSettings
     : public content::WebContentsObserver,
       public content_settings::Observer,
       public content::WebContentsUserData<TabSpecificContentSettings> {
  public:
@@ skipping 128 matching lines @@
   // CONTENT_SETTINGS_TYPE_JAVASCRIPT).
   // TODO(vabr): Only public for tests. Move to a test client.
   void ClearNavigationRelatedContentSettings();
 
   // Notifies that a Flash download has been blocked.
   void FlashDownloadBlocked();
 
   // Changes the |content_blocked_| entry for popups.
   void SetPopupsBlocked(bool blocked);
 
-  // Changes |subresource_filter_enabled_| entry for the Safe Browsing
-  // Subresource Filter.
-  void SetSubresourceBlocked(bool enabled);
-
   // Returns whether a particular kind of content has been blocked for this
   // page.
   bool IsContentBlocked(ContentSettingsType content_type) const;
 
-  // Returns true if Safe Browsing Subresource Filter is active for the page.
-  // TODO(melandory): revisit this method if/once content setting will be added.
-  bool IsSubresourceBlocked() const;
-
   // Returns true if content blockage was indicated to the user.
   bool IsBlockageIndicated(ContentSettingsType content_type) const;
 
-  // Returns true if the activation of the Safe Browsing Subresource Filter was
-  // indicated to the user.
-  bool IsSubresourceBlockageIndicated() const;
-
   void SetBlockageHasBeenIndicated(ContentSettingsType content_type);
 
-  // Changes |subresource_filter_blockage_indicated_| in order to mark that
-  // Safe Browsing Subresource Filter was activated.
-  void SetSubresourceBlockageIndicated();
-
   // Returns whether a particular kind of content has been allowed. Currently
   // only tracks cookies.
   bool IsContentAllowed(ContentSettingsType content_type) const;
 
   // Returns the names of plugins that have been blocked for this tab.
   const std::vector<base::string16>& blocked_plugin_names() const {
     return blocked_plugin_names_;
   }
 
   const GURL& media_stream_access_origin() const {
@@ skipping 245 matching lines @@
   MicrophoneCameraState microphone_camera_state_;
   // The selected devices at the last media stream request.
   std::string media_stream_selected_audio_device_;
   std::string media_stream_selected_video_device_;
 
   // The devices to be displayed in the media bubble when the media stream
   // request is requesting certain specific devices.
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
-  // Manages information about Subresource filtering activation.
-  bool subresource_filter_enabled_;
-  bool subresource_filter_blockage_indicated_;
-
   // Holds the previous committed url during a navigation.
   GURL previous_url_;
 
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_