Wait for renaming chrome.exe to finish during shutdown for

system level in use update.
Also remove obsoleted code in this code path.

BUG=55969
TEST=repro steps in BUG

Review URL: http://codereview.chromium.org/3429029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60751 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 14 deletions

diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index 38b76a3..9e078c0 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -84,6 +84,7 @@ bool InvokeGoogleUpdateForRename() {
                                        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 @@ bool Upgrade::SwapNewChromeExeIfPresent() {
   }
 
   // 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))
-    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