Switch BookmarkTabHelper to use WebContentsUserData.

chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc

Index: chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc
diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc b/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc
index 90c4665cfcc64855453b0cfb320b06399e897520..7bd23b57b4b97073b9c641f06f3110ded227326c 100644
--- a/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc
+++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
@@ -18,33 +17,34 @@
 using content::WebContents;
 
 WebDragBookmarkHandlerAura::WebDragBookmarkHandlerAura()
-    : tab_(NULL) {
+    : bookmark_tab_helper_(NULL),
+      web_contents_(NULL) {
 }
 
 WebDragBookmarkHandlerAura::~WebDragBookmarkHandlerAura() {
 }
 
 void WebDragBookmarkHandlerAura::DragInitialize(WebContents* contents) {
-  // Ideally we would want to initialize the the TabContents member in
+  // Ideally we would want to initialize the the BookmarkTabHelper member in
   // the constructor. We cannot do that as the WebDragDest object is
   // created during the construction of the WebContents object.  The
-  // TabContents is created much later.
-  DCHECK(tab_ ? (tab_->web_contents() == contents) : true);
-  if (!tab_)
-    tab_ = TabContents::FromWebContents(contents);
+  // BookmarkTabHelper is created much later.
+  web_contents_ = contents;
+  if (!bookmark_tab_helper_)
+    bookmark_tab_helper_ = BookmarkTabHelper::FromWebContents(contents);
 }
 
 void WebDragBookmarkHandlerAura::OnDragOver() {
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
     if (bookmark_drag_data_.is_valid())
-      tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragOver(
+      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragOver(
           bookmark_drag_data_);
   }
 }
 
 void WebDragBookmarkHandlerAura::OnReceiveDragData(
     const ui::OSExchangeData& data) {
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
     // Read the bookmark drag data and save it for use in later events in this
     // drag.
     bookmark_drag_data_.Read(data);
@@ -52,25 +52,24 @@ void WebDragBookmarkHandlerAura::OnReceiveDragData(
 }
 
 void WebDragBookmarkHandlerAura::OnDragEnter() {
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
     if (bookmark_drag_data_.is_valid())
-      tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragEnter(
+      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragEnter(
           bookmark_drag_data_);
   }
 }
 
 void WebDragBookmarkHandlerAura::OnDrop() {
-  if (tab_) {
-    if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_) {
+    if (bookmark_tab_helper_->GetBookmarkDragDelegate()) {
       if (bookmark_drag_data_.is_valid()) {
-        tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop(
+        bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDrop(
             bookmark_drag_data_);
       }
     }
 
     // Focus the target browser.
-    Browser* browser = browser::FindBrowserWithWebContents(
-        tab_->web_contents());
+    Browser* browser = browser::FindBrowserWithWebContents(web_contents_);
     if (browser)
       browser->window()->Show();
   }
@@ -79,9 +78,9 @@ void WebDragBookmarkHandlerAura::OnDrop() {
 }
 
 void WebDragBookmarkHandlerAura::OnDragLeave() {
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
     if (bookmark_drag_data_.is_valid())
-      tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave(
+      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragLeave(
           bookmark_drag_data_);
   }