Switch Extensions::TabHelper to use WebContents, 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 102 matching lines @@
   InsertTabContentsAt(index, contents,
                       foreground ? (ADD_INHERIT_GROUP | ADD_ACTIVE) :
                                    ADD_NONE);
 }
 
 void TabStripModel::InsertTabContentsAt(int index,
                                         TabContents* contents,
                                         int add_types) {
   bool active = add_types & ADD_ACTIVE;
   // Force app tabs to be pinned.
-  bool pin =
-      contents->extension_tab_helper()->is_app() || add_types & ADD_PINNED;
+  extensions::TabHelper* extensions_tab_helper =
+      extensions::TabHelper::FromWebContents(contents->web_contents());
+  bool pin = extensions_tab_helper->is_app() || add_types & ADD_PINNED;
   index = ConstrainInsertionIndex(index, pin);
 
   // In tab dragging situations, if the last tab in the window was detached
   // then the user aborted the drag, we will have the |closing_all_| member
   // set (see DetachTabContentsAt) which will mess with our mojo here. We need
   // to clear this bit.
   closing_all_ = false;
 
   // Have to get the active contents before we monkey with |contents_|
   // otherwise we run into problems when we try to change the active contents
@@ skipping 423 matching lines @@
 bool TabStripModel::IsTabPinned(int index) const {
   DCHECK(ContainsIndex(index));
   return contents_data_[index]->pinned;
 }
 
 bool TabStripModel::IsMiniTab(int index) const {
   return IsTabPinned(index) || IsAppTab(index);
 }
 
 bool TabStripModel::IsAppTab(int index) const {
-  TabContents* contents = GetTabContentsAt(index);
-  return contents && contents->extension_tab_helper()->is_app();
+  WebContents* contents = GetTabContentsAt(index)->web_contents();
+  return contents && extensions::TabHelper::FromWebContents(contents)->is_app();
 }
 
 bool TabStripModel::IsTabBlocked(int index) const {
   return contents_data_[index]->blocked;
 }
 
 bool TabStripModel::IsTabDiscarded(int index) const {
   return contents_data_[index]->discarded;
 }
 
@@ skipping 412 matching lines @@
       break;
     }
 
     case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const extensions::Extension* extension =
           content::Details<extensions::UnloadedExtensionInfo>(
               details)->extension;
       // Iterate backwards as we may remove items while iterating.
       for (int i = count() - 1; i >= 0; i--) {
         TabContents* contents = GetTabContentsAt(i);
-        if (contents->extension_tab_helper()->extension_app() == extension) {
+        if (extensions::TabHelper::FromWebContents(contents->web_contents())->
+              extension_app() == extension) {
           // The extension an app tab was created from has been nuked. Delete
           // the WebContents. Deleting a WebContents results in a notification
           // of type NOTIFICATION_WEB_CONTENTS_DESTROYED; we do the necessary
           // cleanup in handling that notification.
 
           InternalCloseTab(contents, i, false);
         }
       }
       break;
     }
@@ skipping 298 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;
   }
 }