Index: trunk/src/chrome/installer/mini_installer/mini_installer.cc |
=================================================================== |
--- trunk/src/chrome/installer/mini_installer/mini_installer.cc (revision 251368) |
+++ trunk/src/chrome/installer/mini_installer/mini_installer.cc (working copy) |
@@ -402,12 +402,10 @@ |
// If we found setup 'B7' resource, handle it. |
if (setup_path->length() > 0) { |
CommandString cmd_line; |
- PathString exe_path; |
// Get the path to setup.exe first. |
bool success = true; |
- if (!GetSetupExePathFromRegistry(configuration, exe_path.get(), |
- exe_path.capacity()) || |
- !cmd_line.assign(exe_path.get()) || |
+ if (!GetSetupExePathFromRegistry(configuration, cmd_line.get(), |
+ cmd_line.capacity()) || |
!cmd_line.append(kCmdUpdateSetupExe) || |
!cmd_line.append(L"=\"") || |
!cmd_line.append(setup_path->get()) || |
@@ -427,7 +425,7 @@ |
int exit_code = 0; |
if (success && |
- (!RunProcessAndWait(exe_path.get(), cmd_line.get(), &exit_code) || |
+ (!RunProcessAndWait(NULL, cmd_line.get(), &exit_code) || |
exit_code != ERROR_SUCCESS)) { |
success = false; |
} |