Remove TabContents from TabStripModelObserver::TabReplacedAt.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 1135 matching lines @@
 
 void Browser::TabMoved(WebContents* contents,
                        int from_index,
                        int to_index) {
   DCHECK(from_index >= 0 && to_index >= 0);
   // Notify the history service.
   SyncHistoryWithTabs(std::min(from_index, to_index));
 }
 
 void Browser::TabReplacedAt(TabStripModel* tab_strip_model,
-                            TabContents* old_contents,
-                            TabContents* new_contents,
+                            WebContents* old_contents,
+                            WebContents* new_contents,
                             int index) {
-  TabDetachedAtImpl(old_contents->web_contents(), index, DETACH_TYPE_REPLACE);
+  TabDetachedAtImpl(old_contents, index, DETACH_TYPE_REPLACE);
   SessionService* session_service =
       SessionServiceFactory::GetForProfile(profile_);
   if (session_service)
-    session_service->TabClosing(old_contents->web_contents());
-  TabInsertedAt(new_contents->web_contents(), index, (index == active_index()));
+    session_service->TabClosing(old_contents);
+  TabInsertedAt(new_contents, index, (index == active_index()));
 
-  int entry_count =
-      new_contents->web_contents()->GetController().GetEntryCount();
+  int entry_count = new_contents->GetController().GetEntryCount();
   if (entry_count > 0) {
     // Send out notification so that observers are updated appropriately.
-    new_contents->web_contents()->GetController().NotifyEntryChanged(
-        new_contents->web_contents()->GetController().GetEntryAtIndex(
-            entry_count - 1),
+    new_contents->GetController().NotifyEntryChanged(
+        new_contents->GetController().GetEntryAtIndex(entry_count - 1),
         entry_count - 1);
   }
 
   if (session_service) {
     // The new_contents may end up with a different navigation stack. Force
     // the session service to update itself.
     session_service->TabRestored(new_contents,
                                  tab_strip_model_->IsTabPinned(index));
   }
 
   content::DevToolsManager::GetInstance()->ContentsReplaced(
-      old_contents->web_contents(), new_contents->web_contents());
+      old_contents, new_contents);
 }
 
 void Browser::TabPinnedStateChanged(WebContents* contents, int index) {
   SessionService* session_service =
       SessionServiceFactory::GetForProfileIfExisting(profile());
   if (session_service) {
     SessionTabHelper* session_tab_helper =
         SessionTabHelper::FromWebContents(contents);
     session_service->SetPinnedState(session_id(),
                                     session_tab_helper->session_id(),
@@ skipping 1157 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }