Remove various TabContents use from TabStripModel.

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 1121 matching lines @@
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                       ActiveTabChanged(old_contents, new_contents,
                                        active_index(),
                                        notify_types == NOTIFY_USER_GESTURE));
     // Activating a discarded tab reloads it, so it is no longer discarded.
     contents_data_[active_index()]->discarded = false;
   }
 }
 
 void TabStripModel::NotifyIfActiveOrSelectionChanged(
-    TabContents* old_contents,
+    WebContents* old_contents,
     NotifyTypes notify_types,
     const TabStripSelectionModel& old_model) {
-  NotifyIfActiveTabChanged(old_contents ? old_contents->web_contents() : NULL,
-                           notify_types);
+  NotifyIfActiveTabChanged(old_contents, notify_types);
 
   if (!selection_model().Equals(old_model)) {
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                       TabSelectionChanged(this, old_model));
   }
 }
 
 void TabStripModel::SetSelection(
     const TabStripSelectionModel& new_model,
     NotifyTypes notify_types) {
-  TabContents* old_contents = GetActiveTabContents();
+  WebContents* old_contents = GetActiveWebContents();
   TabStripSelectionModel old_model;
   old_model.Copy(selection_model_);
   if (new_model.active() != selection_model_.active())
-    NotifyIfTabDeactivated(old_contents ? old_contents->web_contents() : NULL);
+    NotifyIfTabDeactivated(old_contents);
   selection_model_.Copy(new_model);
   NotifyIfActiveOrSelectionChanged(old_contents, notify_types, old_model);
 }
 
 void TabStripModel::SelectRelativeTab(bool next) {
   // This may happen during automated testing or if a user somehow buffers
   // many key accelerators.
   if (contents_data_.empty())
     return;
 
@@ skipping 66 matching lines @@
 void TabStripModel::ForgetOpenersAndGroupsReferencing(
     const WebContents* tab) {
   for (WebContentsDataVector::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;
   }
 }