Switch BookmarkTabHelper to use WebContentsUserData.

chrome/browser/ui/cocoa/tabpose_window.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/tabpose_window.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <algorithm>
 
@@ skipping 219 matching lines @@
     BrowserWindowController* bwc =
         static_cast<BrowserWindowController*>(windowController);
     InfoBarContainerController* infoBarContainer =
         [bwc infoBarContainerController];
     // TODO(thakis|rsesek): This is not correct for background tabs with
     // infobars as the aspect ratio will be wrong. Fix that.
     topOffset += NSHeight([[infoBarContainer view] frame]) -
         [infoBarContainer overlappingTipHeight];
   }
 
+  BookmarkTabHelper* bookmark_tab_helper =
+      BookmarkTabHelper::FromWebContents(contents_->web_contents());
   bool always_show_bookmark_bar =
       contents_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
   bool has_detached_bookmark_bar =
-      contents_->bookmark_tab_helper()->ShouldShowBookmarkBar() &&
+      bookmark_tab_helper->ShouldShowBookmarkBar() &&
       !always_show_bookmark_bar;
   if (has_detached_bookmark_bar)
     topOffset += bookmarks::kNTPBookmarkBarHeight;
 
   return topOffset;
 }
 
 - (int)bottomOffset {
   int bottomOffset = 0;
   TabContents* devToolsContents =
@@ skipping 1413 matching lines @@
   tile.set_tab_contents(contents);
   ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
   [thumbLayer setTabContents:contents];
 }
 
 - (void)tabStripModelDeleted {
   [self close];
 }
 
 @end