CommandLine refactoring and cleanup.

chrome/installer/util/install_util.h

 // Copyright (c) 2011 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.
 //
 // This file declares utility functions for the installer. The original reason
 // for putting these functions in installer\util library is so that we can
 // separate out the critical logic and write unit tests for it.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__
 #define CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__
@@ skipping 133 matching lines @@
     virtual bool Evaluate(const std::wstring& value) const OVERRIDE;
    protected:
     std::wstring value_to_match_;
    private:
     DISALLOW_COPY_AND_ASSIGN(ValueEquals);
   };
 
   // Returns zero on install success, or an InstallStatus value otherwise.
   static int GetInstallReturnCode(installer::InstallStatus install_status);
 
-  // Composes |exe_path| and |arguments| into |command_line|.
-  static void MakeUninstallCommand(const std::wstring& exe_path,
+  // Composes |program| and |arguments| into |command_line|.
+  static void MakeUninstallCommand(const std::wstring& program,
                                    const std::wstring& arguments,
                                    CommandLine* command_line);
 
   // Returns a string in the form YYYYMMDD of the current date.
   static std::wstring GetCurrentDate();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__