ChromeOs: Call BrowserList::SessionEnding when shutting down via SIGTERM

chrome/browser/ui/browser_list.cc

Index: chrome/browser/ui/browser_list.cc
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index cc536f1611d7e51c4c8f9d4100440910231c54ec..0ff923a2a3be2573e687ac8486acdc72cd38ec00 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -281,8 +281,8 @@ void BrowserList::AttemptExitInternal() {
 // static
 void BrowserList::NotifyAndTerminate(bool fast_path) {
 #if defined(OS_CHROMEOS)
-  if (!signout) return;
-  NotifyWindowManagerAboutSignout();
+  if (!signout)
+    return;
 #endif
 
   if (fast_path) {
@@ -292,6 +292,7 @@ void BrowserList::NotifyAndTerminate(bool fast_path) {
   }
 
 #if defined(OS_CHROMEOS)
+  NotifyWindowManagerAboutSignout();
   chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
   if (cros_library->EnsureLoaded()) {
     // If update has been installed, reboot, otherwise, sign out.
@@ -439,9 +440,8 @@ void BrowserList::AttemptUserExit() {
       state->ScheduleSavePersistentPrefs();
     }
   }
-  if (FastShutdown()) {
+  if (FastShutdown())
     return;
-  }
 #else
   // Reset the restart bit that might have been set in cancelled restart
   // request.
@@ -481,7 +481,7 @@ void BrowserList::AttemptExit() {
 // static
 void BrowserList::ExitCleanly() {
   // We always mark exit cleanly.
-  MarkAsCleanShutdown();
+  g_browser_process->EndSession();

[achuithb, 2011/06/30 20:27:55]

This is good. It seems unnecessary that EndSession waits on the FILE thread for
upto 10 seconds before it continues with the rest of the shutdown sequence. Do
you think that matters?

[oshima, 2011/06/30 21:26:33]

It MAY wait for 10 seconds (i'm most case not). Note that it uses
SavePersistentPrefs but not ScheulePersistentPrefs, so it should write it
immediately. This is just an timeout for the case that somehow FILE thread
didn't finish in 10 seconds.

[achuithb, 2011/06/30 21:51:21]

The wait seems unnecessary and unhelpful in our case, since we don't really care
when the FILE thread finishes. Don't you agree? Do you think it makes sense to
pull out the code to MarkAsCleanShutdown and save metrics in a separate common
function (basically EndSession without the blocking part) and call that function
instead?

   AttemptExitInternal();
 }
 #endif