Switch BlockedContentTabHelper to use WebContentsUserData.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 1403 matching lines @@
 void Browser::RenderWidgetShowing() {
   window_->DisableInactiveFrame();
 }
 
 int Browser::GetExtraRenderViewHeight() const {
   return window_->GetExtraRenderViewHeight();
 }
 
 void Browser::OnStartDownload(WebContents* source,
                               content::DownloadItem* download) {
-  TabContents* tab_contents = TabContents::FromWebContents(source);
-  TabContents* constrained = GetConstrainingTabContents(tab_contents);
-  if (constrained != tab_contents) {
+  WebContents* constrained = GetConstrainingWebContents(source);
+  if (constrained != source) {
     // Download in a constrained popup is shown in the tab that opened it.
-    WebContents* constrained_tab = constrained->web_contents();
-    constrained_tab->GetDelegate()->OnStartDownload(constrained_tab, download);
+    constrained->GetDelegate()->OnStartDownload(constrained, download);
     return;
   }
 
   if (!window())
     return;
 
   // GetDownloadShelf creates the download shelf if it was not yet created.
   DownloadShelf* shelf = window()->GetDownloadShelf();
   shelf->AddDownload(new DownloadItemModel(download));
   // Don't show the animation for "Save file" downloads.
@@ skipping 297 matching lines @@
   }
   tab_strip_model_->SetTabBlocked(index, blocked);
   command_controller_->PrintingStateChanged();
   if (!blocked && chrome::GetActiveTabContents(this) == tab_contents)
     tab_contents->web_contents()->Focus();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, BlockedContentTabHelperDelegate implementation:
 
-TabContents* Browser::GetConstrainingTabContents(TabContents* source) {
+content::WebContents* Browser::GetConstrainingWebContents(
+    content::WebContents* source) {
   return source;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, BookmarkTabHelperDelegate implementation:
 
 void Browser::URLStarredChanged(content::WebContents* web_contents,
                                 bool starred) {
   if (web_contents == chrome::GetActiveWebContents(this))
     window_->SetStarredState(starred);
@@ skipping 529 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }