Move the window destruction and registration out of cleanup and into BrowserProcessImpl::EndSession…

chrome/browser/process_singleton.h

Index: chrome/browser/process_singleton.h
===================================================================
--- chrome/browser/process_singleton.h	(revision 141718)
+++ chrome/browser/process_singleton.h	(working copy)
@@ -109,7 +109,7 @@
   bool FoundOtherProcessWindow() const {
       return (NULL != remote_window_);
   }
-#endif  // defined(OS_WIN)
+#endif  // defined(OS_WIN) && !defined(USE_AURA)
 
   // Sets ourself up as the singleton instance.  Returns true on success.  If
   // false is returned, we are not the singleton instance and the caller must
@@ -121,6 +121,13 @@
   // Clear any lock state during shutdown.
   void Cleanup();
 
+#if defined(OS_WIN)
+  // We need to unregister the window as late as possible so that we can detect
+  // another instance of chrome running. Otherwise we may end up writing out
+  // data while a new chrome is starting up.
+  void UnregisterWindowClass();
+#endif  // defined(OS_WIN)
+
   // Blocks the dispatch of CopyData messages. foreground_window refers
   // to the window that should be set to the foreground if a CopyData message
   // is received while the ProcessSingleton is locked.