Switch BlockedContentTabHelper to use WebContentsUserData.

chrome/browser/ui/views/external_tab_container_win.cc

 // 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.
 
 #include "chrome/browser/ui/views/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 238 matching lines @@
       (GetWindowLong(GetNativeView(), GWL_STYLE) & ~WS_POPUP) | style);
 
   // Now apply the parenting and style
   if (parent)
     SetParent(GetNativeView(), parent);
 
   ::ShowWindow(tab_contents_->web_contents()->GetNativeView(), SW_SHOWNA);
 
   LoadAccelerators();
   SetupExternalTabView();
-  tab_contents_->blocked_content_tab_helper()->set_delegate(this);
+  BlockedContentTabHelper::FromWebContents(tab_contents_->web_contents())->
+      set_delegate(this);
   return true;
 }
 
 void ExternalTabContainerWin::Uninitialize() {
   registrar_.RemoveAll();
   if (tab_contents_.get()) {
     UnregisterRenderViewHost(
         tab_contents_->web_contents()->GetRenderViewHost());
 
     if (GetWidget()->GetRootView())
@@ skipping 291 matching lines @@
     automation_->Send(new AutomationMsg_CloseExternalTab(tab_handle_));
   }
 }
 
 void ExternalTabContainerWin::MoveContents(WebContents* source,
                                            const gfx::Rect& pos) {
   if (automation_ && is_popup_window_)
     automation_->Send(new AutomationMsg_MoveWindow(tab_handle_, pos));
 }
 
-TabContents* ExternalTabContainerWin::GetConstrainingTabContents(
-    TabContents* source) {
+content::WebContents* ExternalTabContainerWin::GetConstrainingWebContents(
+    content::WebContents* source) {
   return source;
 }
 
 ExternalTabContainerWin::~ExternalTabContainerWin() {
   Uninitialize();
 }
 
 bool ExternalTabContainerWin::IsPopupOrPanel(const WebContents* source) const {
   return is_popup_window_;
 }
@@ skipping 689 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   WebContents* new_contents =
       ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }