Switch BookmarkTabHelper to use WebContentsUserData.

chrome/browser/ui/cocoa/browser_window_controller_private.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/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #import "base/memory/scoped_nsobject.h"
@@ skipping 468 matching lines @@
 }
 
 - (BOOL)shouldShowBookmarkBar {
   DCHECK(browser_.get());
   return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar) ?
       YES : NO;
 }
 
 - (BOOL)shouldShowDetachedBookmarkBar {
   DCHECK(browser_.get());
-  TabContents* tab = chrome::GetActiveTabContents(browser_.get());
-  return (tab && tab->bookmark_tab_helper()->ShouldShowBookmarkBar() &&
+  WebContents* web_contents = chrome::GetActiveWebContents(browser_.get());
+  BookmarkTabHelper* bookmark_tab_helper =
+      web_contents ? BookmarkTabHelper::FromWebContents(web_contents) : NULL;
+  return (bookmark_tab_helper && bookmark_tab_helper->ShouldShowBookmarkBar() &&
           ![previewableContentsController_ isShowingPreview]);
 }
 
 - (void)adjustToolbarAndBookmarkBarForCompression:(CGFloat)compression {
   CGFloat newHeight =
       [toolbarController_ desiredHeightForCompression:compression];
   NSRect toolbarFrame = [[toolbarController_ view] frame];
   CGFloat deltaH = newHeight - toolbarFrame.size.height;
 
   if (deltaH == 0)
@@ skipping 358 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [presentationModeController_ cancelAnimationAndTimers];
 }
 
 @end  // @implementation BrowserWindowController(Private)