Merge 142682 - Move the window destruction and registration out of cleanup and into BrowserProcessI…

chrome/browser/process_singleton_win.cc

 // 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.
 
 #include "chrome/browser/process_singleton.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 181 matching lines @@
                                user_data_dir.value().c_str(),
                                0, 0, 0, 0, 0, HWND_MESSAGE, 0, hinst, this);
       CHECK(window_);
     }
     BOOL success = ReleaseMutex(only_me);
     DCHECK(success) << "GetLastError = " << GetLastError();
   }
 }
 
 ProcessSingleton::~ProcessSingleton() {
-  Cleanup();
+  // 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.
+  if (window_) {
+    ::DestroyWindow(window_);
+    ::UnregisterClass(chrome::kMessageWindowClass,
+                      base::GetModuleFromAddress(&ThunkWndProc));
+  }
 }
 
 ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
   if (is_virtualized_)
     return PROCESS_NOTIFIED;  // We already spawned the process in this case.
   else if (!remote_window_)
     return PROCESS_NONE;
 
   // Found another window, send our command line to it
   // format is "START\0<<<current directory>>>\0<<<commandline>>>".
@@ skipping 84 matching lines @@
   DCHECK(!remote_window_);
   DCHECK(notification_callback_.is_null());
 
   if (window_ != NULL)
     notification_callback_ = notification_callback;
 
   return window_ != NULL;
 }
 
 void ProcessSingleton::Cleanup() {
-  // Window classes registered by DLLs are not cleaned up automatically on
-  // process exit, so we must unregister at the earliest chance possible.
-  // During the fast shutdown sequence, ProcessSingleton::Cleanup() is
-  // called if our process was the first to start.  Therefore we try cleaning
-  // up here, and again in the destructor if needed to catch as many cases
-  // as possible.
-  if (window_) {
-    ::DestroyWindow(window_);
-    ::UnregisterClass(chrome::kMessageWindowClass,
-                      base::GetModuleFromAddress(&ThunkWndProc));
-    window_ = NULL;
-  }
 }
 
 LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) {
   // If locked, it means we are not ready to process this message because
   // we are probably in a first run critical phase.
   if (locked_) {
 #if defined(USE_AURA)
     NOTIMPLEMENTED();
 #else
     // Attempt to place ourselves in the foreground / flash the task bar.
@@ skipping 25 matching lines @@
   switch (message) {
     case WM_COPYDATA:
       return OnCopyData(reinterpret_cast<HWND>(wparam),
                         reinterpret_cast<COPYDATASTRUCT*>(lparam));
     default:
       break;
   }
 
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }