Switch BlockedContentTabHelper to use WebContentsUserData.

chrome/browser/ui/views/external_tab_container_win.cc

Index: chrome/browser/ui/views/external_tab_container_win.cc
diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc
index 4753593ee5a02032526cce95e82325a5c3eb0079..7dfe392e8babd5ee6515fbea90f245a4103e095c 100644
--- a/chrome/browser/ui/views/external_tab_container_win.cc
+++ b/chrome/browser/ui/views/external_tab_container_win.cc
@@ -256,7 +256,8 @@ bool ExternalTabContainerWin::Init(Profile* profile,
 
   LoadAccelerators();
   SetupExternalTabView();
-  tab_contents_->blocked_content_tab_helper()->set_delegate(this);
+  BlockedContentTabHelper::FromWebContents(tab_contents_->web_contents())->
+      set_delegate(this);
   return true;
 }
 
@@ -568,8 +569,8 @@ void ExternalTabContainerWin::MoveContents(WebContents* source,
     automation_->Send(new AutomationMsg_MoveWindow(tab_handle_, pos));
 }
 
-TabContents* ExternalTabContainerWin::GetConstrainingTabContents(
-    TabContents* source) {
+content::WebContents* ExternalTabContainerWin::GetConstrainingWebContents(
+    content::WebContents* source) {
   return source;
 }