Move blocked content from TabContents to TabContentsWrapper.

content/browser/tab_contents/tab_contents_delegate.h

Index: content/browser/tab_contents/tab_contents_delegate.h
diff --git a/content/browser/tab_contents/tab_contents_delegate.h b/content/browser/tab_contents/tab_contents_delegate.h
index d47aac77d1915317829b78e055973d4d7c37ab4e..892573b59de218f2801131cc47e1833d1e52c113 100644
--- a/content/browser/tab_contents/tab_contents_delegate.h
+++ b/content/browser/tab_contents/tab_contents_delegate.h
@@ -10,7 +10,6 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/automation/automation_resource_routing_delegate.h"
-#include "chrome/common/content_settings_types.h"
 #include "chrome/common/instant_types.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/common/navigation_types.h"
@@ -109,7 +108,9 @@ class TabContentsDelegate : public AutomationResourceRoutingDelegate {
   virtual bool IsPopup(const TabContents* source) const;
 
   // If |source| is constrained, returns the tab containing it.  Otherwise
-  // returns |source|.
+  // returns |source|. TODO(avi): Remove in favor of GetConstrainingContents on
+  // ContentSettingsTabHelperDelegate once uses of it in TabContents are
+  // removed.
   virtual TabContents* GetConstrainingContents(TabContents* source);
 
   // Returns true if constrained windows should be focused. Default is true.
@@ -267,12 +268,6 @@ class TabContentsDelegate : public AutomationResourceRoutingDelegate {
   // Shows the repost form confirmation dialog box.
   virtual void ShowRepostFormWarningDialog(TabContents* tab_contents);
 
-  // Shows the Content Settings page for a given content type.
-  virtual void ShowContentSettingsPage(ContentSettingsType content_type);
-
-  // Shows the cookies collected in the tab contents.
-  virtual void ShowCollectedCookiesDialog(TabContents* tab_contents);
-
   // Allows delegate to override navigation to the history entries.
   // Returns true to allow TabContents to continue with the default processing.
   virtual bool OnGoToEntryOffset(int offset);