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

chrome/browser/first_run/first_run_win.cc

 // Copyright (c) 2010 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/first_run/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 66 matching lines @@
 bool InvokeGoogleUpdateForRename() {
   ScopedComPtr<IProcessLauncher> ipl;
   if (!FAILED(ipl.CreateInstance(__uuidof(ProcessLauncherClass)))) {
     ULONG_PTR phandle = NULL;
     DWORD id = GetCurrentProcessId();
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     if (!FAILED(ipl->LaunchCmdElevated(dist->GetAppGuid().c_str(),
                                        google_update::kRegRenameCmdField,
                                        id, &phandle))) {
       HANDLE handle = HANDLE(phandle);
+      WaitForSingleObject(handle, INFINITE);
       DWORD exit_code;
       ::GetExitCodeProcess(handle, &exit_code);
       ::CloseHandle(handle);
       if (exit_code == installer_util::RENAME_SUCCESSFUL)
         return true;
     }
   }
   return false;
 }
 
@@ skipping 190 matching lines @@
     if (base::LaunchApp(rename_cmd, true, true, &handle)) {
       DWORD exit_code;
       ::GetExitCodeProcess(handle, &exit_code);
       ::CloseHandle(handle);
       if (exit_code == installer_util::RENAME_SUCCESSFUL)
         return true;
     }
   }
 
   // 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
 bool Upgrade::DoUpgradeTasks(const CommandLine& command_line) {
   if (!Upgrade::SwapNewChromeExeIfPresent())
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!Upgrade::RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
@@ skipping 543 matching lines @@
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td(version);
   return td.ShowModal();
 }