Temp dir cleanup:...

chrome/installer/util/move_tree_work_item.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_
 #define CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_
 #pragma once
 
-#include <windows.h>
-
-#include <string>
-
 #include "base/file_path.h"
+#include "base/scoped_temp_dir.h"
 #include "chrome/installer/util/work_item.h"
 
 // A WorkItem subclass that recursively move a file system hierarchy from
 // source path to destination path. The file system hierarchy could be a
 // single file, or a directory.
 //
 // Under the cover MoveTreeWorkItem moves the destination path, if existing,
 // to the temporary directory passed in, and then moves the source hierarchy
 // to the destination location. During rollback the original destination
 // hierarchy is moved back.
@@ skipping 18 matching lines @@
 
   // Source path to move files from.
   FilePath source_path_;
 
   // Destination path to move files to.
   FilePath dest_path_;
 
   // Temporary directory to backup dest_path_ (if it already exists).
   FilePath temp_dir_;
 
-  // The full path in temp_dir_ where the original dest_path_ has
-  // been moved to.
-  FilePath backup_path_;
+  // The temporary directory into which the original dest_path_ has been moved.
+  ScopedTempDir backup_path_;
 
   // Whether the source was moved to dest_path_
   bool moved_to_dest_path_;
 
   // Whether the original files have been moved to backup path under
   // temporary directory. If true, moving back is needed during rollback.
   bool moved_to_backup_;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_