Temp dir cleanup:...

chrome/installer/util/installer_state_unittest.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 <windows.h>
 
 #include <fstream>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/installer_state.h"
 #include "chrome/installer/util/master_preferences.h"
@@ skipping 87 matching lines @@
   ASSERT_TRUE(file_util::PathExists(chrome_dll_3));
 
   FilePath chrome_dll_4(chrome_dir_4);
   chrome_dll_4 = chrome_dll_4.AppendASCII("chrome.dll");
   CreateTextFile(chrome_dll_4.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(chrome_dll_4));
 
   MockInstallerState installer_state;
   BuildSingleChromeState(chrome_dir, &installer_state);
   scoped_ptr<Version> latest_version(Version::GetVersionFromString("1.0.4.0"));
-  installer_state.RemoveOldVersionDirectories(*latest_version.get());
+  {
+    ScopedTempDir temp_dir;
+    ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+    installer_state.RemoveOldVersionDirectories(*latest_version.get(),
+                                                temp_dir.path());
+  }
 
   // old versions should be gone
   EXPECT_FALSE(file_util::PathExists(chrome_dir_1));
   EXPECT_FALSE(file_util::PathExists(chrome_dir_2));
   EXPECT_FALSE(file_util::PathExists(chrome_dir_3));
   // the latest version should stay
   EXPECT_TRUE(file_util::PathExists(chrome_dll_4));
 }
 
 // Delete older version directories, keeping the one in used intact.
@@ skipping 54 matching lines @@
   ASSERT_TRUE(file_util::PathExists(chrome_dll_3));
 
   FilePath chrome_dll_4(chrome_dir_4);
   chrome_dll_4 = chrome_dll_4.AppendASCII("chrome.dll");
   CreateTextFile(chrome_dll_4.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(chrome_dll_4));
 
   MockInstallerState installer_state;
   BuildSingleChromeState(chrome_dir, &installer_state);
   scoped_ptr<Version> latest_version(Version::GetVersionFromString("1.0.4.0"));
-  installer_state.RemoveOldVersionDirectories(*latest_version.get());
+  {
+    ScopedTempDir temp_dir;
+    ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+    installer_state.RemoveOldVersionDirectories(*latest_version.get(),
+                                                temp_dir.path());
+  }
 
   // old versions not in used should be gone
   EXPECT_FALSE(file_util::PathExists(chrome_dir_1));
   EXPECT_FALSE(file_util::PathExists(chrome_dir_3));
   // every thing under in used version should stay
   EXPECT_TRUE(file_util::PathExists(chrome_dir_2));
   EXPECT_TRUE(file_util::PathExists(chrome_dll_2));
   EXPECT_TRUE(file_util::PathExists(chrome_othera_2));
   EXPECT_TRUE(file_util::PathExists(chrome_otherb_2));
   // the latest version should stay
@@ skipping 51 matching lines @@
   EXPECT_FALSE(file_util::PathExists(old_chrome_dll));
 
   // Hold on to the file exclusively to prevent the directory from
   // being deleted.
   base::win::ScopedHandle file(
     ::CreateFile(old_chrome_dll.value().c_str(), GENERIC_READ,
                  0, NULL, OPEN_ALWAYS, 0, NULL));
   EXPECT_TRUE(file.IsValid());
   EXPECT_TRUE(file_util::PathExists(old_chrome_dll));
 
-  installer_state.RemoveOldVersionDirectories(*new_version.get());
+  ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  installer_state.RemoveOldVersionDirectories(*new_version.get(),
+                                              temp_dir.path());
+
   // The old directory should still exist.
   EXPECT_TRUE(file_util::PathExists(old_version_dir));
   EXPECT_TRUE(file_util::PathExists(new_version_dir));
 
   // Now close the file handle to make it possible to delete our key file.
   file.Close();
 
-  installer_state.RemoveOldVersionDirectories(*new_version.get());
+  installer_state.RemoveOldVersionDirectories(*new_version.get(),
+                                              temp_dir.path());
   // The new directory should still exist.
   EXPECT_TRUE(file_util::PathExists(new_version_dir));
 
   // Now, the old directory and key file should be gone.
   EXPECT_FALSE(file_util::PathExists(old_chrome_dll));
   EXPECT_FALSE(file_util::PathExists(old_version_dir));
 }
 
 TEST_F(InstallerStateTest, WithProduct) {
   const bool multi_install = false;
@@ skipping 31 matching lines @@
       // TODO(tommi): Also test for when there exists a new_chrome.exe.
       scoped_ptr<Version> found_version(installer_state.GetCurrentVersion(
           machine_state));
       EXPECT_TRUE(found_version.get() != NULL);
       if (found_version.get()) {
         EXPECT_TRUE(current_version->Equals(*found_version));
       }
     }
   }
 }