Move blocked content from TabContents to TabContentsWrapper.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 88336a610024b7537dfd49ad4fa46d50e7413b95..e6ba9e133062db7e05b5bd5b36ace49798432d8b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -266,8 +266,6 @@
         'browser/background_mode_manager_win.cc',
         'browser/background_page_tracker.cc',
         'browser/background_page_tracker.h',
-        'browser/blocked_content_container.cc',
-        'browser/blocked_content_container.h',
         'browser/bookmarks/base_bookmark_model_observer.cc',
         'browser/bookmarks/base_bookmark_model_observer.h',
         'browser/bookmarks/bookmark_codec.cc',
@@ -737,12 +735,6 @@
         'browser/cocoa/scoped_authorizationref.h',
         'browser/command_updater.cc',
         'browser/command_updater.h',
-        'browser/content_setting_bubble_model.cc',
-        'browser/content_setting_bubble_model.h',
-        'browser/content_setting_combo_model.cc',
-        'browser/content_setting_combo_model.h',
-        'browser/content_setting_image_model.cc',
-        'browser/content_setting_image_model.h',
         'browser/content_settings/content_settings_base_provider.cc',
         'browser/content_settings/content_settings_base_provider.h',
         'browser/content_settings/content_settings_details.h',
@@ -2100,6 +2092,12 @@
         'browser/ui/app_modal_dialogs/message_box_handler.cc',
         'browser/ui/app_modal_dialogs/message_box_handler.h',
         'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
+        'browser/ui/blocked_content/blocked_content_container.cc',
+        'browser/ui/blocked_content/blocked_content_container.h',
+        'browser/ui/blocked_content/blocked_content_tab_helper.cc',
+        'browser/ui/blocked_content/blocked_content_tab_helper.h',
+        'browser/ui/blocked_content/blocked_content_tab_helper_delegate.cc',
+        'browser/ui/blocked_content/blocked_content_tab_helper_delegate.h',
         'browser/ui/browser.cc',
         'browser/ui/browser.h',
         'browser/ui/browser_dialogs.h',
@@ -2540,6 +2538,12 @@
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm',
         'browser/ui/collected_cookies_infobar_delegate.h',
         'browser/ui/collected_cookies_infobar_delegate.cc',
+        'browser/ui/content_settings/content_setting_bubble_model.cc',
+        'browser/ui/content_settings/content_setting_bubble_model.h',
+        'browser/ui/content_settings/content_setting_combo_model.cc',
+        'browser/ui/content_settings/content_setting_combo_model.h',
+        'browser/ui/content_settings/content_setting_image_model.cc',
+        'browser/ui/content_settings/content_setting_image_model.h',
         'browser/ui/crypto_module_password_dialog.h',
         'browser/ui/crypto_module_password_dialog_nss.cc',
         'browser/ui/crypto_module_password_dialog_openssl.cc',