Temp dir cleanup:...

chrome/installer/util/installer_state.cc

 // Copyright (c) 2010 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/util/installer_state.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 370 matching lines @@
 
   return current_version.release();
 }
 
 FilePath InstallerState::GetInstallerDirectory(const Version& version) const {
   return target_path().Append(ASCIIToWide(version.GetString()))
       .Append(kInstallerDir);
 }
 
 void InstallerState::RemoveOldVersionDirectories(
-    const Version& latest_version) const {
+    const Version& latest_version,
+    const FilePath& temp_path) const {
   file_util::FileEnumerator version_enum(target_path(), false,
       file_util::FileEnumerator::DIRECTORIES);
   scoped_ptr<Version> version;
   std::vector<FilePath> key_files;
 
   // We try to delete all directories whose versions are lower than
   // latest_version.
   FilePath next_version = version_enum.Next();
   while (!next_version.empty()) {
     file_util::FileEnumerator::FindInfo find_data = {0};
     version_enum.GetFindInfo(&find_data);
     VLOG(1) << "directory found: " << find_data.cFileName;
     version.reset(Version::GetVersionFromString(
                       WideToASCII(find_data.cFileName)));
     if (version.get() && latest_version.CompareTo(*version) > 0) {
       key_files.clear();
       std::for_each(products_.begin(), products_.end(),
                     std::bind2nd(std::mem_fun(&Product::AddKeyFiles),
                                  &key_files));
       const std::vector<FilePath>::iterator end = key_files.end();
       for (std::vector<FilePath>::iterator scan = key_files.begin();
            scan != end; ++scan) {
         *scan = next_version.Append(*scan);
       }
 
       VLOG(1) << "Deleting directory: " << next_version.value();
 
       scoped_ptr<WorkItem> item(
-          WorkItem::CreateDeleteTreeWorkItem(next_version, key_files));
+          WorkItem::CreateDeleteTreeWorkItem(next_version, temp_path,
+                                             key_files));
       if (!item->Do())
         item->Rollback();
     }
 
     next_version = version_enum.Next();
   }
 }
 
 void InstallerState::AddComDllList(std::vector<FilePath>* com_dll_list) const {
   std::for_each(products_.begin(), products_.end(),
                 std::bind2nd(std::mem_fun(&Product::AddComDllList),
                              com_dll_list));
 }
 
 bool InstallerState::SetChannelFlags(bool set,
                                      ChannelInfo* channel_info) const {
   bool modified = false;
   for (Products::const_iterator scan = products_.begin(), end = products_.end();
        scan != end; ++scan) {
      modified |= (*scan)->SetChannelFlags(set, channel_info);
   }
   return modified;
 }
 
 }  // namespace installer