Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f…

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 <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/content_settings/content_settings_usages_state.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/common/content_settings.h"
@@ skipping 179 matching lines @@
     return media_stream_requested_audio_device_;
   }
 
   const std::string& media_stream_requested_video_device() const {
     return media_stream_requested_video_device_;
   }
 
   // Returns the state of the camera and microphone usage.
   MicrophoneCameraState GetMicrophoneCameraState() const;
 
-  const std::set<std::string>& BlockedResourcesForType(
-      ContentSettingsType content_type) const;
-
   // Returns the ContentSettingsUsagesState that controls the
   // geolocation API usage on this page.
   const ContentSettingsUsagesState& geolocation_usages_state() const {
     return geolocation_usages_state_;
   }
 
   // Returns the ContentSettingsUsageState that controls the MIDI usage on
   // this page.
   const ContentSettingsUsagesState& midi_usages_state() const {
     return midi_usages_state_;
@@ skipping 66 matching lines @@
       int64 parent_frame_id,
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
       bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void AppCacheAccessed(const GURL& manifest_url,
                                 bool blocked_by_policy) OVERRIDE;
 
   // Message handlers. Public for testing.
-  void OnContentBlocked(ContentSettingsType type,
-                        const std::string& resource_identifier);
+  void OnContentBlocked(ContentSettingsType type);
   void OnContentAllowed(ContentSettingsType type);
 
   // These methods are invoked on the UI thread by the static functions above.
   // Public for testing.
   void OnCookiesRead(const GURL& url,
                      const GURL& first_party_url,
                      const net::CookieList& cookie_list,
                      bool blocked_by_policy);
   void OnCookieChanged(const GURL& url,
                        const GURL& first_party_url,
@@ skipping 35 matching lines @@
   // locale shared object, like for example a cookie, is accessed.
   void AddSiteDataObserver(SiteDataObserver* observer);
 
   // Removes the given |SiteDataObserver|.
   void RemoveSiteDataObserver(SiteDataObserver* observer);
 
  private:
   explicit TabSpecificContentSettings(content::WebContents* tab);
   friend class content::WebContentsUserData<TabSpecificContentSettings>;
 
-  void AddBlockedResource(ContentSettingsType content_type,
-                          const std::string& resource_identifier);
-
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Notifies all registered |SiteDataObserver|s.
   void NotifySiteDataObservers();
 
   // All currently registered |SiteDataObserver|s.
   ObserverList<SiteDataObserver> observer_list_;
 
   // Stores which content setting types actually have blocked content.
   bool content_blocked_[CONTENT_SETTINGS_NUM_TYPES];
 
   // Stores if the blocked content was messaged to the user.
   bool content_blockage_indicated_to_user_[CONTENT_SETTINGS_NUM_TYPES];
 
   // Stores which content setting types actually were allowed.
   bool content_allowed_[CONTENT_SETTINGS_NUM_TYPES];
 
-  // Stores the blocked resources for each content type.
-  // Currently only used for plugins.
-  scoped_ptr<std::set<std::string> >
-      blocked_resources_[CONTENT_SETTINGS_NUM_TYPES];
-
   // The profile of the tab.
   Profile* profile_;
 
   // Stores the blocked/allowed cookies.
   LocalSharedObjectsContainer allowed_local_shared_objects_;
   LocalSharedObjectsContainer blocked_local_shared_objects_;
 
   // Manages information about Geolocation API usage in this page.
   ContentSettingsUsagesState geolocation_usages_state_;
 
@@ skipping 27 matching lines @@
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_