Wait for renaming chrome.exe to finish during shutdown for...

chrome/browser/first_run/first_run_win.cc

Index: chrome/browser/first_run/first_run_win.cc
===================================================================
--- chrome/browser/first_run/first_run_win.cc	(revision 60656)
+++ chrome/browser/first_run/first_run_win.cc	(working copy)
@@ -84,6 +84,7 @@
                                        google_update::kRegRenameCmdField,
                                        id, &phandle))) {
       HANDLE handle = HANDLE(phandle);
+      WaitForSingleObject(handle, INFINITE);
       DWORD exit_code;
       ::GetExitCodeProcess(handle, &exit_code);
       ::CloseHandle(handle);
@@ -294,20 +295,7 @@
   }
 
   // Rename didn't work so try to rename by calling Google Update
-  if (InvokeGoogleUpdateForRename())
-    return true;
-
-  // Rename still didn't work so just try to rename exe ourselves (for
-  // backward compatibility, can be deleted once the new process works).
-  std::wstring backup_exe;
-  if (!GetBackupChromeFile(&backup_exe))

[cpu_(ooo_6.6-7.5), 2010/09/28 01:16:21]

are you sure we want to remove this fallback?

I don't see the harm of that being there.

-    return false;
-  if (::ReplaceFileW(curr_chrome_exe.c_str(), new_chrome_exe.value().c_str(),
-                     backup_exe.c_str(), REPLACEFILE_IGNORE_MERGE_ERRORS,
-                     NULL, NULL)) {
-    return true;
-  }
-  return false;
+  return InvokeGoogleUpdateForRename();
 }
 
 // static