Switch BookmarkTabHelper to use WebContentsUserData.

chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h

Index: chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h
diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h b/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h
index a94bf4bcad8fc803f9cf285f2520c22c2e0eab24..2dbd8a8d88056955f8fb4a6428d80e6ec52c7fa3 100644
--- a/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h
+++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h
@@ -9,7 +9,11 @@
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
 
-class TabContents;
+class BookmarkTabHelper;
+
+namespace content {
+class WebContents;
+}
 
 // Chrome needs to intercept content drag events so it can dispatch them to the
 // bookmarks and extensions system.
@@ -26,10 +30,12 @@ class WebDragBookmarkHandlerMac : public content::WebDragDestDelegate {
   virtual void OnDragLeave() OVERRIDE;
 
  private:
-  // The TabContents.
-  // Weak reference; may be NULL if the contents aren't contained in a
-  // TabContents (e.g. WebUI dialogs).
-  TabContents* tab_;
+  // The BookmarkTabHelper.
+  // Weak reference; may be NULL if the contents don't have a
+  // BookmarkTabHelper (e.g. WebUI dialogs).
+  BookmarkTabHelper* bookmark_tab_helper_;
+
+  content::WebContents* web_contents_;
 
   // The bookmark data for the current tab. This will be empty if there is not
   // a native bookmark drag.