Temp dir cleanup:...

chrome/installer/setup/install.cc

 // 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.
 
 #include "chrome/installer/setup/install.h"
 
 #include <shlobj.h>
 #include <time.h>
 #include <vector>
 
@@ skipping 39 matching lines @@
   file_util::AppendToPath(&reg_path, installer::kChromeExe);
   VLOG(1) << "Adding Chrome to Media player list at " << reg_path;
   scoped_ptr<WorkItem> work_item(WorkItem::CreateCreateRegKeyWorkItem(
       HKEY_LOCAL_MACHINE, reg_path));
 
   // if the operation fails we log the error but still continue
   if (!work_item.get()->Do())
     LOG(ERROR) << "Could not add Chrome to media player inclusion list.";
 }
 
-void AddInstallerCopyTasks(const InstallerState& installer_state,
-                           const FilePath& setup_path,
-                           const FilePath& archive_path,
-                           const FilePath& temp_path,
-                           const Version& new_version,
-                           WorkItemList* install_list) {
-  DCHECK(install_list);
-  FilePath installer_dir(installer_state.GetInstallerDirectory(new_version));
-  install_list->AddCreateDirWorkItem(installer_dir);
-
-  FilePath exe_dst(installer_dir.Append(setup_path.BaseName()));
-  FilePath archive_dst(installer_dir.Append(archive_path.BaseName()));
-
-  install_list->AddCopyTreeWorkItem(setup_path.value(), exe_dst.value(),
-                                    temp_path.value(), WorkItem::ALWAYS);
-  if (installer_state.system_install()) {
-    install_list->AddCopyTreeWorkItem(archive_path.value(), archive_dst.value(),
-                                      temp_path.value(), WorkItem::ALWAYS);
-  } else {
-    install_list->AddMoveTreeWorkItem(archive_path.value(), archive_dst.value(),
-                                      temp_path.value());
-  }
-}
-
 // Copy master preferences file provided to installer, in the same folder
 // as chrome.exe so Chrome first run can find it. This function will be called
 // only on the first install of Chrome.
 void CopyPreferenceFileForFirstRun(const InstallerState& installer_state,
                                    const FilePath& prefs_source_path) {
   FilePath prefs_dest_path(installer_state.target_path().AppendASCII(
       installer::kDefaultMasterPrefs));
   if (!file_util::CopyFile(prefs_source_path, prefs_dest_path)) {
     VLOG(1) << "Failed to copy master preferences from:"
             << prefs_source_path.value() << " gle: " << ::GetLastError();
@@ skipping 162 matching lines @@
 }
 
 // This function installs a new version of Chrome to the specified location.
 //
 // setup_path: Path to the executable (setup.exe) as it will be copied
 //           to Chrome install folder after install is complete
 // archive_path: Path to the archive (chrome.7z) as it will be copied
 //               to Chrome install folder after install is complete
 // src_path: the path that contains a complete and unpacked Chrome package
 //           to be installed.
-// temp_dir: the path of working directory used during installation. This path
-//           does not need to exist.
+// temp_path: the path of working directory used during installation. This path
+//            does not need to exist.
 // new_version: new Chrome version that needs to be installed
 // current_version: returns the current active version (if any)
 //
 // This function makes best effort to do installation in a transactional
 // manner. If failed it tries to rollback all changes on the file system
 // and registry. For example, if package exists before calling the
 // function, it rolls back all new file and directory changes under
 // package. If package does not exist before calling the function
 // (typical new install), the function creates package during install
 // and removes the whole directory during rollback.
 installer::InstallStatus InstallNewVersion(
     const InstallationState& original_state,
     const InstallerState& installer_state,
     const FilePath& setup_path,
     const FilePath& archive_path,
     const FilePath& src_path,
-    const FilePath& temp_dir,
+    const FilePath& temp_path,
     const Version& new_version,
     scoped_ptr<Version>* current_version) {
   DCHECK(current_version);
 
   current_version->reset(installer_state.GetCurrentVersion(original_state));
   scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
 
   AddInstallWorkItems(original_state,
                       installer_state,
                       setup_path,
                       archive_path,
                       src_path,
-                      temp_dir,
+                      temp_path,
                       new_version,
                       current_version,
                       install_list.get());
 
   AddElevationPolicyWorkItems(original_state, installer_state, new_version,
                               install_list.get());
 
   FilePath new_chrome_exe(
       installer_state.target_path().Append(installer::kChromeNewExe));
 
@@ skipping 110 matching lines @@
           result == INSTALL_REPAIRED) {
         prefs.GetBool(master_preferences::kMakeChromeDefaultForUser,
                       &force_chrome_default_for_user);
       }
 
       RegisterChromeOnMachine(installer_state, *chrome_install,
           make_chrome_default || force_chrome_default_for_user);
     }
 
     installer_state.RemoveOldVersionDirectories(existing_version.get() ?
-        *existing_version.get() : new_version);
+        *existing_version.get() : new_version, install_temp_path);
   }
 
   return result;
 }
 
 }  // namespace installer