Merge 251369 "Revert 250500 "Add quotes around executable pathes..."

chrome/installer/mini_installer/mini_installer.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.
 
 // mini_installer.exe is the first exe that is run when chrome is being
 // installed or upgraded. It is designed to be extremely small (~5KB with no
 // extra resources linked) and it has two main jobs:
 //   1) unpack the resources (possibly decompressing some)
 //   2) run the real installer (setup.exe) with appropriate flags.
 //
@@ skipping 384 matching lines @@
   // We need a chrome archive to do the installation. So if there
   // is a problem in fetching B7 resource, just return an error.
   if (!::EnumResourceNames(module, kLZMAResourceType, OnResourceFound,
                            reinterpret_cast<LONG_PTR>(&context)) ||
       archive_path->length() == 0)
     return false;
 
   // 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()) ||
         !cmd_line.append(L"\"") ||
         !cmd_line.append(kCmdNewSetupExe) ||
         !cmd_line.append(L"=\"") ||
         !cmd_line.append(setup_dest_path.get()) ||
         !cmd_line.append(L"\"")) {
       success = false;
     }
 
     // Get any command line option specified for mini_installer and pass them
     // on to setup.exe.  This is important since switches such as
     // --multi-install and --chrome-frame affect where setup.exe will write
     // installer results for consumption by Google Update.
     AppendCommandLineFlags(configuration, &cmd_line);
 
     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;
     }
 
     if (!success)
       DeleteFile(setup_path->get());
 
     return success && setup_path->assign(setup_dest_path.get());
   }
 
@@ skipping 414 matching lines @@
     case 1:
       dest8[count - 1] = c;
   }
 
   while (adjcount-- > 0)  // Copy the rest, 4 bytes/32 bits at a time
     *(dest32++) = fill;
 
   return dest;
 }
 }  // extern "C"