Switch BookmarkTabHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.h

Index: chrome/browser/ui/tab_contents/tab_contents.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents.h b/chrome/browser/ui/tab_contents/tab_contents.h
index 2c9c4194a5e737541539ef5e87733b617af4b365..627386fe80fd45ad621ab6ffdc3f12e6707bee85 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.h
+++ b/chrome/browser/ui/tab_contents/tab_contents.h
@@ -17,7 +17,6 @@ class AutofillManager;
 class AutomationTabHelper;
 class BasePanelBrowserTest;
 class BlockedContentTabHelper;
-class BookmarkTabHelper;
 class Browser;
 class BrowserCommandsTabContentsCreator;
 class BrowserLauncherItemControllerContentsCreator;
@@ -205,10 +204,6 @@ class TabContents : public content::WebContentsObserver {
     return blocked_content_tab_helper_.get();
   }
 
-  BookmarkTabHelper* bookmark_tab_helper() {
-    return bookmark_tab_helper_.get();
-  }
-
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
   captive_portal::CaptivePortalTabHelper* captive_portal_tab_helper() {
     return captive_portal_tab_helper_.get();
@@ -307,7 +302,6 @@ class TabContents : public content::WebContentsObserver {
   scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
   scoped_ptr<AutomationTabHelper> automation_tab_helper_;
   scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
-  scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
   scoped_ptr<captive_portal::CaptivePortalTabHelper> captive_portal_tab_helper_;
 #endif