Set the working directory on relaunch

chrome/browser/first_run/upgrade_util_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/first_run/upgrade_util.h"
 
 #include <windows.h>
 #include <psapi.h>
 #include <shellapi.h>
 
@@ skipping 75 matching lines @@
     NOTREACHED();
     return false;
   }
 
   // Explicitly make sure to relaunch chrome.exe rather than old_chrome.exe.
   // This can happen when old_chrome.exe is launched by a user.
   base::CommandLine chrome_exe_command_line = command_line;
   chrome_exe_command_line.SetProgram(
       chrome_exe.DirName().Append(installer::kChromeExe));
 
-  return base::LaunchProcess(chrome_exe_command_line, base::LaunchOptions())
-      .IsValid();
+  // Set the working directory to the exe's directory. This avoids a handle to
+  // the version directory being kept open in the relaunched child process.
+  base::LaunchOptions launch_options;
+  launch_options.current_directory = chrome_exe.DirName();
+  return base::LaunchProcess(chrome_exe_command_line, launch_options).IsValid();
 }
 
 bool IsUpdatePendingRestart() {
   base::FilePath new_chrome_exe;
   if (!GetNewerChromeFile(&new_chrome_exe))
     return false;
   return base::PathExists(new_chrome_exe);
 }
 
 bool SwapNewChromeExeIfPresent() {
@@ skipping 58 matching lines @@
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
   }
   return true;
 }
 
 }  // namespace upgrade_util