Speculative Revert 195108 "Changes to closing contents with beforeunload/unl..."

trunk/src/chrome/browser/ui/browser.cc

Index: trunk/src/chrome/browser/ui/browser.cc
===================================================================
--- trunk/src/chrome/browser/ui/browser.cc	(revision 195133)
+++ trunk/src/chrome/browser/ui/browser.cc	(working copy)
@@ -599,14 +599,6 @@
   return unload_controller_->ShouldCloseWindow();
 }
 
-bool Browser::TabsNeedBeforeUnloadFired() {
-  return unload_controller_->TabsNeedBeforeUnloadFired();
-}
-
-bool Browser::HasCompletedUnloadProcessing() const {
-  return unload_controller_->HasCompletedUnloadProcessing();
-}
-
 bool Browser::IsAttemptingToCloseBrowser() const {
   return unload_controller_->is_attempting_to_close_browser();
 }
@@ -648,11 +640,8 @@
       chrome::NOTIFICATION_BROWSER_CLOSING,
       content::Source<Browser>(this),
       content::NotificationService::NoDetails());
-}
 
-void Browser::OnUnloadProcessingCompleted() {
-  MessageLoop::current()->PostTask(
-      FROM_HERE, base::Bind(&Browser::CloseFrame, weak_factory_.GetWeakPtr()));
+  tab_strip_model_->CloseAllTabs();
 }
 
 void Browser::OnWindowActivated() {
@@ -1203,6 +1192,10 @@
   window()->HandleKeyboardEvent(event);
 }
 
+bool Browser::TabsNeedBeforeUnloadFired() {
+  return unload_controller_->TabsNeedBeforeUnloadFired();
+}
+
 bool Browser::IsMouseLocked() const {
   return fullscreen_controller_->IsMouseLocked();
 }