Switch CoreTabHelper to use WebContentsUserData.

chrome/browser/ui/tabs/tab_strip_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/tabs/tab_strip_model.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 738 matching lines @@
     case CommandNewTab:
     case CommandCloseTab:
       return true;
 
     case CommandReload: {
       std::vector<int> indices = GetIndicesForCommand(context_index);
       for (size_t i = 0; i < indices.size(); ++i) {
         TabContents* tab = GetTabContentsAt(indices[i]);
         if (tab) {
           CoreTabHelperDelegate* core_delegate =
-              tab->core_tab_helper()->delegate();
-          if (!core_delegate || core_delegate->CanReloadContents(tab))
+              CoreTabHelper::FromWebContents(tab->web_contents())->delegate();
+          if (!core_delegate ||
+              core_delegate->CanReloadContents(tab->web_contents()))
             return true;
         }
       }
       return false;
     }
 
     case CommandCloseOtherTabs:
     case CommandCloseTabsToRight:
       return !GetIndicesClosedByCommand(context_index, command_id).empty();
 
@@ skipping 44 matching lines @@
       delegate()->AddBlankTabAt(context_index + 1, true);
       break;
 
     case CommandReload: {
       content::RecordAction(UserMetricsAction("TabContextMenu_Reload"));
       std::vector<int> indices = GetIndicesForCommand(context_index);
       for (size_t i = 0; i < indices.size(); ++i) {
         TabContents* tab = GetTabContentsAt(indices[i]);
         if (tab) {
           CoreTabHelperDelegate* core_delegate =
-              tab->core_tab_helper()->delegate();
-          if (!core_delegate || core_delegate->CanReloadContents(tab))
+              CoreTabHelper::FromWebContents(tab->web_contents())->delegate();
+          if (!core_delegate ||
+              core_delegate->CanReloadContents(tab->web_contents()))
             tab->web_contents()->GetController().Reload(true);
         }
       }
       break;
     }
 
     case CommandDuplicate: {
       content::RecordAction(UserMetricsAction("TabContextMenu_Duplicate"));
       std::vector<int> indices = GetIndicesForCommand(context_index);
       // Copy the TabContents off as the indices will change as tabs are
@@ skipping 476 matching lines @@
 void TabStripModel::ForgetOpenersAndGroupsReferencing(
     const NavigationController* tab) {
   for (TabContentsDataVector::const_iterator i = contents_data_.begin();
        i != contents_data_.end(); ++i) {
     if ((*i)->group == tab)
       (*i)->group = NULL;
     if ((*i)->opener == tab)
       (*i)->opener = NULL;
   }
 }