Unbreak tabs.onRemove extension API in face of fast tab closure

chrome/browser/ui/unload_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/unload_controller.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 144 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // UnloadController, TabStripModelObserver implementation:
 
 void UnloadController::TabInsertedAt(content::WebContents* contents,
                                      int index,
                                      bool foreground) {
   TabAttachedImpl(contents);
 }
 
 void UnloadController::TabDetachedAt(content::WebContents* contents,
-                                     int index) {
+                                     int index,
+                                     bool closing_all) {
   TabDetachedImpl(contents);
 }
 
 void UnloadController::TabReplacedAt(TabStripModel* tab_strip_model,
                                      content::WebContents* old_contents,
                                      content::WebContents* new_contents,
                                      int index) {
   TabDetachedImpl(old_contents);
   TabAttachedImpl(new_contents);
 }
@@ skipping 38 matching lines @@
 
   if (is_attempting_to_close_browser_)
     ClearUnloadState(contents);
 }
 
 bool UnloadController::DetachWebContents(content::WebContents* contents) {
   int index = browser_->tab_strip_model()->GetIndexOfWebContents(contents);
   if (index != TabStripModel::kNoTab &&
       contents->NeedToFireBeforeUnload()) {
     tabs_needing_unload_ack_.insert(contents);
+    CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(contents);
+    core_tab_helper->OnUnloadAboutToDetach();
     browser_->tab_strip_model()->DetachWebContentsAt(index);
     contents->SetDelegate(detached_delegate_.get());
-    CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(contents);
     core_tab_helper->OnUnloadDetachedStarted();
     return true;
   }
   return false;
 }
 
 void UnloadController::ProcessPendingTabs() {
   if (!is_attempting_to_close_browser_) {
     // Because we might invoke this after a delay it's possible for the value of
     // is_attempting_to_close_browser_ to have changed since we scheduled the
@@ skipping 132 matching lines @@
 }
 
 void UnloadController::PostTaskForProcessPendingTabs() {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&UnloadController::ProcessPendingTabs,
                  weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace chrome