Have content/ create and destroy its own threads.

chrome/browser/browser_shutdown.h

Index: chrome/browser/browser_shutdown.h
diff --git a/chrome/browser/browser_shutdown.h b/chrome/browser/browser_shutdown.h
index b567b5d5af84d2d812c6d14822e1f4927896f15f..e4fc71676787cf81c07127e76f887fef04f43815 100644
--- a/chrome/browser/browser_shutdown.h
+++ b/chrome/browser/browser_shutdown.h
@@ -34,13 +34,25 @@ void OnShutdownStarting(ShutdownType type);
 // Get the current shutdown type.
 ShutdownType GetShutdownType();
 
+// Performs the shutdown tasks that need to be done before
+// BrowserProcess and the various threads go away.
+//
+// Returns true if the session should be restarted.
+bool ShutdownPreThreadsStop();
+
+// Performs the remaining shutdown tasks after all threads but the
+// main thread have been stopped.  This includes deleting g_browser_process.
+//
 // Invoked in two ways:
 // . When the last browser has been deleted and the message loop has finished
 //   running.
 // . When ChromeFrame::EndSession is invoked and we need to do cleanup.

[robertshield, 2011/11/14 04:15:55]

This second bullet in this old comment looks out of date. Either
BrowserProcessImpl::EndSession() or BrowserList::TimeLimitedSessionEnding() are
probably what are being referred to.

 //   NOTE: in this case the message loop is still running, but will die soon
 //         after this returns.
-void Shutdown();
+//
+// The provided parameter indicates whether a preference to restart
+// the session was present.
+void ShutdownPostThreadsStop(bool restart_last_session);
 
 // Called at startup to create a histogram from our previous shutdown time.
 void ReadLastShutdownInfo();