Remove TabContents from TabStripModelObserver::ActiveTabChanged.

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 1050 matching lines @@
 
 void Browser::TabDeactivated(WebContents* contents) {
   fullscreen_controller_->OnTabDeactivated(contents);
   search_delegate_->OnTabDeactivated(contents);
 
   // Save what the user's currently typing, so it can be restored when we
   // switch back to this tab.
   window_->GetLocationBar()->SaveStateToContents(contents);
 }
 
-void Browser::ActiveTabChanged(TabContents* old_contents,
-                               TabContents* new_contents,
+void Browser::ActiveTabChanged(WebContents* old_contents,
+                               WebContents* new_contents,
                                int index,
                                bool user_gesture) {
   // On some platforms we want to automatically reload tabs that are
   // killed when the user selects them.
   bool did_reload = false;
-  if (user_gesture && ShouldReloadCrashedTab(new_contents->web_contents())) {
+  if (user_gesture && ShouldReloadCrashedTab(new_contents)) {
     LOG(WARNING) << "Reloading killed tab at " << index;
     static int reload_count = 0;
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Tabs.SadTab.ReloadCount", ++reload_count, 1, 1000, 50);
     chrome::Reload(this, CURRENT_TAB);
     did_reload = true;
   }
 
   // Discarded tabs always get reloaded.
   if (!did_reload && tab_strip_model_->IsTabDiscarded(index)) {
     LOG(WARNING) << "Reloading discarded tab at " << index;
     static int reload_count = 0;
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Tabs.Discard.ReloadCount", ++reload_count, 1, 1000, 50);
     chrome::Reload(this, CURRENT_TAB);
   }
 
   // If we have any update pending, do it now.
   if (chrome_updater_factory_.HasWeakPtrs() && old_contents)
     ProcessPendingUIUpdates();
 
   // Propagate the profile to the location bar.
   UpdateToolbar(true);
 
   // Propagate tab state to toolbar, tab-strip, etc.
   UpdateSearchState(new_contents);
 
   // Update reload/stop state.
-  command_controller_->LoadingStateChanged(
-      new_contents->web_contents()->IsLoading(), true);
+  command_controller_->LoadingStateChanged(new_contents->IsLoading(), true);
 
   // Update commands to reflect current state.
   command_controller_->TabStateChanged();
 
   // Reset the status bubble.
   StatusBubble* status_bubble = GetStatusBubble();
   if (status_bubble) {
     status_bubble->Hide();
 
     // Show the loading state (if any).
     status_bubble->SetStatus(
         CoreTabHelper::FromWebContents(chrome::GetActiveWebContents(this))->
             GetStatusText());
   }
 
   if (HasFindBarController()) {
-    find_bar_controller_->ChangeWebContents(new_contents->web_contents());
+    find_bar_controller_->ChangeWebContents(new_contents);
     find_bar_controller_->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
   }
 
   // Update sessions. Don't force creation of sessions. If sessions doesn't
   // exist, the change will be picked up by sessions when created.
   SessionService* session_service =
       SessionServiceFactory::GetForProfileIfExisting(profile_);
   if (session_service && !tab_strip_model_->closing_all()) {
     session_service->SetSelectedTabInWindow(session_id(), active_index());
   }
@@ skipping 826 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, UI update coalescing and handling (private):
 
 void Browser::UpdateToolbar(bool should_restore_state) {
   window_->UpdateToolbar(chrome::GetActiveTabContents(this),
                          should_restore_state);
 }
 
-void Browser::UpdateSearchState(TabContents* contents) {
+void Browser::UpdateSearchState(WebContents* contents) {
   if (chrome::search::IsInstantExtendedAPIEnabled(profile_))
-    search_delegate_->OnTabActivated(contents->web_contents());
+    search_delegate_->OnTabActivated(contents);
 }
 
 void Browser::ScheduleUIUpdate(const WebContents* source,
                                unsigned changed_flags) {
   if (!source)
     return;
 
   // Do some synchronous updates.
   if (changed_flags & content::INVALIDATE_TYPE_URL &&
       source == chrome::GetActiveWebContents(this)) {
@@ skipping 360 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;
 }