Switch BlockedContentTabHelper to use WebContentsUserData.

chrome/browser/ui/browser_tabstrip.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_tabstrip.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 88 matching lines @@
                     content::WebContents* new_contents,
                     WindowOpenDisposition disposition,
                     const gfx::Rect& initial_pos,
                     bool user_gesture,
                     bool* was_blocked) {
   // No code for this yet.
   DCHECK(disposition != SAVE_TO_DISK);
   // Can't create a new contents for the current tab - invalid case.
   DCHECK(disposition != CURRENT_TAB);
 
-  TabContents* source_tab_contents = NULL;
-  BlockedContentTabHelper* source_blocked_content = NULL;
+  // TODO(avi): Use browser tab contents adoption here.
   TabContents* new_tab_contents = TabContents::FromWebContents(new_contents);
   if (!new_tab_contents) {
     new_tab_contents =
         BrowserTabstripTabContentsCreator::CreateTabContents(new_contents);
   }
+
+  BlockedContentTabHelper* source_blocked_content = NULL;
   if (source_contents) {
-    source_tab_contents = TabContents::FromWebContents(source_contents);
-    source_blocked_content = source_tab_contents->blocked_content_tab_helper();
+    source_blocked_content =
+        BlockedContentTabHelper::FromWebContents(source_contents);
   }
 
-  if (source_tab_contents) {
+  if (source_contents) {
     // Handle blocking of tabs.
     if (source_blocked_content->all_contents_blocked()) {
-      source_blocked_content->AddTabContents(
-          new_tab_contents, disposition, initial_pos, user_gesture);
+      source_blocked_content->AddWebContents(
+          new_contents, disposition, initial_pos, user_gesture);
       if (was_blocked)
         *was_blocked = true;
       return;
     }
 
     // Handle blocking of popups.
     if ((disposition == NEW_POPUP || disposition == NEW_FOREGROUND_TAB) &&
         !user_gesture &&
         !CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisablePopupBlocking)) {
       // Unrequested popups from normal pages are constrained unless they're in
       // the white list.  The popup owner will handle checking this.
       source_blocked_content->AddPopup(
-          new_tab_contents, disposition, initial_pos, user_gesture);
+          new_contents, disposition, initial_pos, user_gesture);
       if (was_blocked)
         *was_blocked = true;
       return;
     }
 
     new_contents->GetRenderViewHost()->DisassociateFromPopupCount();
   }
 
   NavigateParams params(browser, new_tab_contents);
   params.source_contents = source_contents ?
@@ skipping 41 matching lines @@
   return BrowserTabstripTabContentsCreator::CreateTabContents(
       content::WebContents::CreateWithSessionStorage(
           profile,
           site_instance,
           routing_id,
           base_web_contents,
           session_storage_namespace_map));
 }
 
 }  // namespace chrome