Makes instant run before unload listeners.

chrome/browser/tabs/tab_strip_model.cc

 // Copyright (c) 2010 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/tabs/tab_strip_model.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stl_util-inl.h"
@@ skipping 147 matching lines @@
     ++selected_index_;
   }
 
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
       TabInsertedAt(contents, index, foreground));
 
   if (foreground)
     ChangeSelectedContentsFrom(selected_contents, index, false);
 }
 
-void TabStripModel::ReplaceTabContentsAt(int index,
-                                         TabContentsWrapper* new_contents) {
+TabContentsWrapper* TabStripModel::ReplaceTabContentsAt(
+    int index,
+    TabContentsWrapper* new_contents) {
   // TODO: this should reset group/opener of any tabs that point at
   // old_contents.
   DCHECK(ContainsIndex(index));
-  scoped_ptr<TabContentsWrapper> old_contents(GetContentsAt(index));
+  TabContentsWrapper* old_contents = GetContentsAt(index);
 
   contents_data_[index]->contents = new_contents;
 
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
-                    TabReplacedAt(old_contents.get(), new_contents, index));
+                    TabReplacedAt(old_contents, new_contents, index));
 
   // When the selected tab contents is replaced send out selected notification
   // too. We do this as nearly all observers need to treat a replace of the
   // selected contents as selection changing.
   if (selected_index_ == index) {
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
-                      TabSelectedAt(old_contents.get(), new_contents,
+                      TabSelectedAt(old_contents, new_contents,
                                     selected_index_, false));
   }
+  return old_contents;
 }
 
 void TabStripModel::ReplaceNavigationControllerAt(
     int index, TabContentsWrapper* contents) {
   // This appears to be OK with no flicker since no redraw event
   // occurs between the call to add an aditional tab and one to close
   // the previous tab.
   InsertTabContentsAt(
       index + 1, contents,
       ADD_SELECTED | ADD_INHERIT_GROUP);
@@ skipping 803 matching lines @@
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                     TabMoved(moved_data->contents, index, to_position));
 }
 
 // static
 bool TabStripModel::OpenerMatches(const TabContentsData* data,
                                   const NavigationController* opener,
                                   bool use_group) {
   return data->opener == opener || (use_group && data->group == opener);
 }