Remove TabContents from TabStripModelObserver::ActiveTabChanged.

chrome/browser/ui/tabs/tab_strip_model_order_controller.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_order_controller.h"
 
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 90 matching lines @@
 
   // No opener set, fall through to the default handler...
   int selected_index = tabstrip_->active_index();
   if (selected_index >= (tab_count - 1))
     return selected_index - 1;
 
   return selected_index;
 }
 
 void TabStripModelOrderController::ActiveTabChanged(
-    TabContents* old_contents,
-    TabContents* new_contents,
+    content::WebContents* old_contents,
+    content::WebContents* new_contents,
     int index,
     bool user_gesture) {
   content::WebContents* old_opener = NULL;
   if (old_contents) {
-    int index = tabstrip_->GetIndexOfTabContents(old_contents);
+    int index = tabstrip_->GetIndexOfWebContents(old_contents);
     if (index != TabStripModel::kNoTab) {
       old_opener = tabstrip_->GetOpenerOfWebContentsAt(index);
 
       // Forget any group/opener relationships that need to be reset whenever
       // selection changes (see comment in TabStripModel::AddTabContentsAt).
       if (tabstrip_->ShouldResetGroupOnSelect(old_contents))
         tabstrip_->ForgetGroup(old_contents);
     }
   }
   content::WebContents* new_opener = tabstrip_->GetOpenerOfWebContentsAt(index);
 
   if (user_gesture && new_opener != old_opener &&
       ((old_contents == NULL && new_opener == NULL) ||
-          new_opener != old_contents->web_contents()) &&
+          new_opener != old_contents) &&
       ((new_contents == NULL && old_opener == NULL) ||
-          old_opener != new_contents->web_contents())) {
+          old_opener != new_contents)) {
     tabstrip_->ForgetAllOpeners();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripModelOrderController, private:
 
 int TabStripModelOrderController::GetValidIndex(
     int index, int removing_index) const {
   if (removing_index < index)
     index = std::max(0, index - 1);
   return index;
 }