Switch BlockedContentTabHelper to use WebContentsUserData.

chrome/browser/ui/blocked_content/blocked_content_tab_helper.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/blocked_content/blocked_content_tab_helper.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_container.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 using content::NavigationEntry;
 
-BlockedContentTabHelper::BlockedContentTabHelper(TabContents* tab_contents)
-    : content::WebContentsObserver(tab_contents->web_contents()),
-      blocked_contents_(new BlockedContentContainer(tab_contents)),
+int BlockedContentTabHelper::kUserDataKey;
+
+BlockedContentTabHelper::BlockedContentTabHelper(
+    content::WebContents* web_contents)
+    : content::WebContentsObserver(web_contents),
+      blocked_contents_(new BlockedContentContainer(web_contents)),
       all_contents_blocked_(false),
-      tab_contents_(tab_contents),
       delegate_(NULL) {
 }
 
 BlockedContentTabHelper::~BlockedContentTabHelper() {
 }
 
 void BlockedContentTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Clear all page actions, blocked content notifications and browser actions
   // for this tab, unless this is an in-page navigation.
   if (!details.is_in_page) {
     // Close blocked popups.
     if (blocked_contents_->GetBlockedContentsCount()) {
       blocked_contents_->Clear();
       PopupNotificationVisibilityChanged(false);
     }
   }
 }
 
 void BlockedContentTabHelper::PopupNotificationVisibilityChanged(
     bool visible) {
-  if (!tab_contents_->in_destructor())
-    tab_contents_->content_settings()->SetPopupsBlocked(visible);
+  if (!web_contents()->IsBeingDestroyed()) {
+    TabContents* tab_contents = TabContents::FromWebContents(web_contents());
+    tab_contents->content_settings()->SetPopupsBlocked(visible);
+  }
 }
 
-void BlockedContentTabHelper::SendNotification(TabContents* contents,
+void BlockedContentTabHelper::SendNotification(content::WebContents* contents,
                                                bool blocked_state) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CONTENT_BLOCKED_STATE_CHANGED,
-      content::Source<content::WebContents>(contents->web_contents()),
+      content::Source<content::WebContents>(contents),
       content::Details<const bool>(&blocked_state));
 }
 
 void BlockedContentTabHelper::SetAllContentsBlocked(bool value) {
   if (all_contents_blocked_ == value)
     return;
 
   all_contents_blocked_ = value;
   if (!all_contents_blocked_ && blocked_contents_->GetBlockedContentsCount()) {
-    std::vector<TabContents*> blocked;
+    std::vector<content::WebContents*> blocked;
     blocked_contents_->GetBlockedContents(&blocked);
     for (size_t i = 0; i < blocked.size(); ++i) {
       SendNotification(blocked[i], false);
       blocked_contents_->LaunchForContents(blocked[i]);
     }
   }
 }
 
-void BlockedContentTabHelper::AddTabContents(TabContents* new_contents,
+void BlockedContentTabHelper::AddWebContents(content::WebContents* new_contents,
                                              WindowOpenDisposition disposition,
                                              const gfx::Rect& initial_pos,
                                              bool user_gesture) {
   if (!blocked_contents_->GetBlockedContentsCount())
     PopupNotificationVisibilityChanged(true);
   SendNotification(new_contents, true);
-  blocked_contents_->AddTabContents(
+  blocked_contents_->AddWebContents(
       new_contents, disposition, initial_pos, user_gesture);
 }
 
-void BlockedContentTabHelper::AddPopup(TabContents* new_contents,
+void BlockedContentTabHelper::AddPopup(content::WebContents* new_contents,
                                        WindowOpenDisposition disposition,
                                        const gfx::Rect& initial_pos,
                                        bool user_gesture) {
   // A page can't spawn popups (or do anything else, either) until its load
   // commits, so when we reach here, the popup was spawned by the
   // NavigationController's last committed entry, not the active entry.  For
   // example, if a page opens a popup in an onunload() handler, then the active
   // entry is the page to be loaded as we navigate away from the unloading
   // page.  For this reason, we can't use GetURL() to get the opener URL,
   // because it returns the active entry.
   NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   GURL creator = entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 
   if (creator.is_valid() &&
       profile->GetHostContentSettingsMap()->GetContentSetting(
           creator,
           creator,
           CONTENT_SETTINGS_TYPE_POPUPS,
           "") == CONTENT_SETTING_ALLOW) {
     content::WebContentsDelegate* delegate = web_contents()->GetDelegate();
     if (delegate) {
       delegate->AddNewContents(web_contents(),
-                               new_contents->web_contents(),
+                               new_contents,
                                disposition,
                                initial_pos,
                                true,  // user_gesture
                                NULL);
     }
   } else {
-    // Call blocked_contents_->AddTabContents with user_gesture == true
+    // Call blocked_contents_->AddWebContents with user_gesture == true
     // so that the contents will not get blocked again.
     SendNotification(new_contents, true);
-    blocked_contents_->AddTabContents(new_contents,
+    blocked_contents_->AddWebContents(new_contents,
                                       disposition,
                                       initial_pos,
                                       true);  // user_gesture
-    tab_contents_->content_settings()->OnContentBlocked(
+    TabContents* tab_contents = TabContents::FromWebContents(web_contents());
+    tab_contents->content_settings()->OnContentBlocked(
           CONTENT_SETTINGS_TYPE_POPUPS, std::string());
   }
 }
 
 void BlockedContentTabHelper::LaunchForContents(
-    TabContents* tab_contents) {
-  SendNotification(tab_contents, false);
-  blocked_contents_->LaunchForContents(tab_contents);
+    content::WebContents* web_contents) {
+  SendNotification(web_contents, false);
+  blocked_contents_->LaunchForContents(web_contents);
   if (!blocked_contents_->GetBlockedContentsCount())
     PopupNotificationVisibilityChanged(false);
 }
 
 size_t BlockedContentTabHelper::GetBlockedContentsCount() const {
   return blocked_contents_->GetBlockedContentsCount();
 }
 
 void BlockedContentTabHelper::GetBlockedContents(
-    std::vector<TabContents*>* blocked_contents) const {
+    std::vector<content::WebContents*>* blocked_contents) const {
   blocked_contents_->GetBlockedContents(blocked_contents);
 }