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

chrome/browser/process_singleton.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROCESS_SINGLETON_H_
 #define CHROME_BROWSER_PROCESS_SINGLETON_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 91 matching lines @@
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Used in specific cases to let us know that there is an existing instance
   // of Chrome running with this profile. In general, you should not use this
   // function. Instead consider using NotifyOtherProcessOrCreate().
   // For non profile-specific method, use
   // browser_util::IsBrowserAlreadyRunning().
   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
   // exit. Otherwise, stores the provided callback for notification from
   // future processes.
   bool Create(
       const NotificationCallback& notification_callback);
 
   // 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.
   void Lock(gfx::NativeWindow foreground_window) {
     DCHECK(CalledOnValidThread());
     locked_ = true;
     foreground_window_ = foreground_window;
   }
 
   // Changes the foreground window without changing the locked state.
@@ skipping 87 matching lines @@
 #endif
 
   // If messages are received in the locked state, the corresponding command
   // lines are saved here to be replayed later.
   std::vector<DelayedStartupMessage> saved_startup_messages_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessSingleton);
 };
 
 #endif  // CHROME_BROWSER_PROCESS_SINGLETON_H_