Switch BookmarkTabHelper to use WebContentsUserData.

chrome/browser/ui/toolbar/action_box_menu_model.cc

 // 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.
 
 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_to_mobile_service.h"
 #include "chrome/browser/chrome_to_mobile_service_factory.h"
@@ skipping 30 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (!browser_->profile()->IsOffTheRecord() &&
       ChromeToMobileServiceFactory::GetForProfile(browser_->profile())->
       HasMobiles()) {
     AddItemWithStringId(IDC_CHROME_TO_MOBILE_PAGE,
                         IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP);
     SetIcon(GetIndexOfCommandId(IDC_CHROME_TO_MOBILE_PAGE),
             rb.GetNativeImageNamed(IDR_MOBILE));
   }
 
-  TabContents* current_tab_contents = chrome::GetActiveTabContents(browser_);
-  bool starred = current_tab_contents->bookmark_tab_helper()->is_starred();
+  content::WebContents* current_web_contents =
+      chrome::GetActiveWebContents(browser_);
+  BookmarkTabHelper* bookmark_tab_helper =
+      BookmarkTabHelper::FromWebContents(current_web_contents);
+  bool starred = bookmark_tab_helper->is_starred();
   AddItemWithStringId(IDC_BOOKMARK_PAGE,
                       starred ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR);
   SetIcon(GetIndexOfCommandId(IDC_BOOKMARK_PAGE),
           rb.GetNativeImageNamed(starred ? IDR_STAR_LIT : IDR_STAR));
 
   AddItemWithStringId(IDC_SHARE_PAGE, IDS_SHARE_PAGE);
   SetIcon(GetIndexOfCommandId(IDC_SHARE_PAGE),
           rb.GetNativeImageNamed(IDR_SHARE));
 
   // Adds extensions to the model.
@@ skipping 57 matching lines @@
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(browser_->profile())->
           extension_service();
   return extension_service->toolbar_model()->action_box_menu_items();
 }
 
 void ActionBoxMenuModel::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
 }